Skip to content

chore(deps-dev): bump prettier from 2.3.2 to 2.7.1 #2413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2022
Merged

chore(deps-dev): bump prettier from 2.3.2 to 2.7.1 #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ad5ddc
chore(deps-dev): bump prettier from 2.3.2 to 2.7.1
dependabot[bot] Oct 10, 2022
7bc9022
Merge branch 'main' into dependabot/npm_and_yarn/prettier-2.7.1
joshblack Oct 10, 2022
631bf70
chore: fix eslint violations
joshblack Oct 10, 2022
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
17 changes: 10 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
47 changes: 24 additions & 23 deletions src/__tests__/deprecated/ChoiceFieldset.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<React.PropsWithChildren<ChoiceFieldsetProps & ChoiceFieldsetListProps>> =
({onSelect, selectionVariant, selected = []}) => {
const [selectionVals, setSelectionVals] = React.useState<string[]>(selected)
const SelectableChoicelistFieldset: React.FC<
React.PropsWithChildren<ChoiceFieldsetProps & ChoiceFieldsetListProps>
> = ({onSelect, selectionVariant, selected = []}) => {
const [selectionVals, setSelectionVals] = React.useState<string[]>(selected)

React.useEffect(() => {
onSelect && onSelect(selectionVals)
}, [onSelect, selectionVals])
React.useEffect(() => {
onSelect && onSelect(selectionVals)
}, [onSelect, selectionVals])

return (
<SSRProvider>
<ChoiceFieldset
onSelect={selectedVals => {
setSelectionVals(selectedVals)
}}
selected={selectionVals}
>
<ChoiceFieldset.Legend>Legend</ChoiceFieldset.Legend>
<ChoiceFieldset.List selectionVariant={selectionVariant}>
<ChoiceFieldset.Item value="labelOne">Label one</ChoiceFieldset.Item>
<ChoiceFieldset.Item value="labelTwo">Label two</ChoiceFieldset.Item>
</ChoiceFieldset.List>
</ChoiceFieldset>
</SSRProvider>
)
}
return (
<SSRProvider>
<ChoiceFieldset
onSelect={selectedVals => {
setSelectionVals(selectedVals)
}}
selected={selectionVals}
>
<ChoiceFieldset.Legend>Legend</ChoiceFieldset.Legend>
<ChoiceFieldset.List selectionVariant={selectionVariant}>
<ChoiceFieldset.Item value="labelOne">Label one</ChoiceFieldset.Item>
<ChoiceFieldset.Item value="labelTwo">Label two</ChoiceFieldset.Item>
</ChoiceFieldset.List>
</ChoiceFieldset>
</SSRProvider>
)
}

describe('ChoiceFieldset', () => {
it('renders default', () => {
Expand Down
7 changes: 3 additions & 4 deletions src/utils/types/MandateProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ where 'id' and 'label' required:
type DatumWithRequiredIdAndLabel = MandateProps<Datum, 'id' | 'label'>
*/

export type MandateProps<T extends unknown, K extends keyof T> = Omit<T, K> &
{
[MK in K]-?: NonNullable<T[MK]>
}
export type MandateProps<T extends unknown, K extends keyof T> = Omit<T, K> & {
[MK in K]-?: NonNullable<T[MK]>
}