diff --git a/apps/portal/src/components/shared/CitiesTypeahead.tsx b/apps/portal/src/components/shared/CitiesTypeahead.tsx index 05e527ca..902759b0 100644 --- a/apps/portal/src/components/shared/CitiesTypeahead.tsx +++ b/apps/portal/src/components/shared/CitiesTypeahead.tsx @@ -1,28 +1,32 @@ +import type { ComponentProps } from 'react'; import { useState } from 'react'; import type { TypeaheadOption } from '@tih/ui'; import { Typeahead } from '@tih/ui'; import { trpc } from '~/utils/trpc'; -type Props = Readonly<{ - disabled?: boolean; - errorMessage?: string; - isLabelHidden?: boolean; - label?: string; - onSelect: (option: TypeaheadOption | null) => void; - placeholder?: string; - required?: boolean; - value?: TypeaheadOption | null; -}>; +type BaseProps = Pick< + ComponentProps, + | 'disabled' + | 'errorMessage' + | 'isLabelHidden' + | 'placeholder' + | 'required' + | 'textSize' +>; + +type Props = BaseProps & + Readonly<{ + label?: string; + onSelect: (option: TypeaheadOption | null) => void; + value?: TypeaheadOption | null; + }>; export default function CitiesTypeahead({ - disabled, label = 'City', onSelect, - isLabelHidden, - placeholder, - required, value, + ...props }: Props) { const [query, setQuery] = useState(''); const cities = trpc.useQuery([ @@ -36,8 +40,6 @@ export default function CitiesTypeahead({ return ( ); } diff --git a/apps/portal/src/components/shared/CompaniesTypeahead.tsx b/apps/portal/src/components/shared/CompaniesTypeahead.tsx index 619d9a55..76d35557 100644 --- a/apps/portal/src/components/shared/CompaniesTypeahead.tsx +++ b/apps/portal/src/components/shared/CompaniesTypeahead.tsx @@ -1,26 +1,30 @@ +import type { ComponentProps } from 'react'; import { useState } from 'react'; import type { TypeaheadOption } from '@tih/ui'; import { Typeahead } from '@tih/ui'; import { trpc } from '~/utils/trpc'; -type Props = Readonly<{ - disabled?: boolean; - errorMessage?: string; - isLabelHidden?: boolean; - onSelect: (option: TypeaheadOption | null) => void; - placeholder?: string; - required?: boolean; - value?: TypeaheadOption | null; -}>; +type BaseProps = Pick< + ComponentProps, + | 'disabled' + | 'errorMessage' + | 'isLabelHidden' + | 'placeholder' + | 'required' + | 'textSize' +>; + +type Props = BaseProps & + Readonly<{ + onSelect: (option: TypeaheadOption | null) => void; + value?: TypeaheadOption | null; + }>; export default function CompaniesTypeahead({ - disabled, onSelect, - isLabelHidden, - placeholder, - required, value, + ...props }: Props) { const [query, setQuery] = useState(''); const companies = trpc.useQuery([ @@ -34,8 +38,6 @@ export default function CompaniesTypeahead({ return ( ); } diff --git a/apps/portal/src/components/shared/CountriesTypeahead.tsx b/apps/portal/src/components/shared/CountriesTypeahead.tsx index c3bae569..51d72cb0 100644 --- a/apps/portal/src/components/shared/CountriesTypeahead.tsx +++ b/apps/portal/src/components/shared/CountriesTypeahead.tsx @@ -1,26 +1,30 @@ +import type { ComponentProps } from 'react'; import { useState } from 'react'; import type { TypeaheadOption } from '@tih/ui'; import { Typeahead } from '@tih/ui'; import { trpc } from '~/utils/trpc'; -type Props = Readonly<{ - disabled?: boolean; - errorMessage?: string; - isLabelHidden?: boolean; - onSelect: (option: TypeaheadOption | null) => void; - placeholder?: string; - required?: boolean; - value?: TypeaheadOption | null; -}>; +type BaseProps = Pick< + ComponentProps, + | 'disabled' + | 'errorMessage' + | 'isLabelHidden' + | 'placeholder' + | 'required' + | 'textSize' +>; + +type Props = BaseProps & + Readonly<{ + onSelect: (option: TypeaheadOption | null) => void; + value?: TypeaheadOption | null; + }>; export default function CountriesTypeahead({ - disabled, onSelect, - isLabelHidden, - placeholder, - required, value, + ...props }: Props) { const [query, setQuery] = useState(''); const countries = trpc.useQuery([ @@ -34,8 +38,6 @@ export default function CountriesTypeahead({ return ( ); } diff --git a/apps/portal/src/components/shared/JobTitlesTypahead.tsx b/apps/portal/src/components/shared/JobTitlesTypahead.tsx index b5221262..9de68c45 100644 --- a/apps/portal/src/components/shared/JobTitlesTypahead.tsx +++ b/apps/portal/src/components/shared/JobTitlesTypahead.tsx @@ -1,25 +1,30 @@ +import type { ComponentProps } from 'react'; import { useState } from 'react'; import type { TypeaheadOption } from '@tih/ui'; import { Typeahead } from '@tih/ui'; import { JobTitleLabels } from './JobTitles'; -type Props = Readonly<{ - disabled?: boolean; - isLabelHidden?: boolean; - onSelect: (option: TypeaheadOption | null) => void; - placeholder?: string; - required?: boolean; - value?: TypeaheadOption | null; -}>; +type BaseProps = Pick< + ComponentProps, + | 'disabled' + | 'errorMessage' + | 'isLabelHidden' + | 'placeholder' + | 'required' + | 'textSize' +>; + +type Props = BaseProps & + Readonly<{ + onSelect: (option: TypeaheadOption | null) => void; + value?: TypeaheadOption | null; + }>; export default function JobTitlesTypeahead({ - disabled, onSelect, - isLabelHidden, - placeholder, - required, value, + ...props }: Props) { const [query, setQuery] = useState(''); const options = Object.entries(JobTitleLabels) @@ -35,18 +40,14 @@ export default function JobTitlesTypeahead({ return ( ); }