Improve types

cultuurnet · Nov 22, 2024 · d092d8b · d092d8b
1 parent 5dba2ce
commit d092d8b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/pages/organizers/[organizerId]/preview/OrganizerLabels.tsx b/src/pages/organizers/[organizerId]/preview/OrganizerLabels.tsx
@@ -20,7 +20,7 @@ import { Inline } from '@/ui/Inline';
 import { Stack } from '@/ui/Stack';
 import { Text, TextVariants } from '@/ui/Text';
 import { getGlobalBorderRadius, getValueFromTheme } from '@/ui/theme';
-import { Typeahead } from '@/ui/Typeahead';
+import { Typeahead, TypeaheadElement } from '@/ui/Typeahead';
 import { getUniqueLabels } from '@/utils/getUniqueLabels';
 
 type OrganizerLabelProps = {
@@ -29,7 +29,7 @@ type OrganizerLabelProps = {
 
 export const OrganizerLabels = ({ organizer }: OrganizerLabelProps) => {
   const { t } = useTranslation();
-  const ref = useRef(null);
+  const ref = useRef<TypeaheadElement<Label>>(null);
   const router = useRouter();
   const [query, setQuery] = useState('');
   // @ts-expect-error

diff --git a/src/pages/steps/AdditionalInformationStep/LabelsStep.tsx b/src/pages/steps/AdditionalInformationStep/LabelsStep.tsx
@@ -22,7 +22,7 @@ import { Inline } from '@/ui/Inline';
 import { getStackProps, Stack, StackProps } from '@/ui/Stack';
 import { Text, TextVariants } from '@/ui/Text';
 import { getGlobalBorderRadius, getValueFromTheme } from '@/ui/theme';
-import { Typeahead } from '@/ui/Typeahead';
+import { Typeahead, TypeaheadElement } from '@/ui/Typeahead';
 import { getUniqueLabels } from '@/utils/getUniqueLabels';
 
 type LabelsStepProps = StackProps & TabContentProps;
@@ -44,7 +44,7 @@ function LabelsStep({
   // @ts-expect-error
   const entity: Offer | Organizer | undefined = getEntityByIdQuery.data;
 
-  const ref = useRef(null);
+  const ref = useRef<TypeaheadElement<Label>>(null);
 
   const [query, setQuery] = useState('');
   // @ts-expect-error

diff --git a/src/ui/Typeahead.tsx b/src/ui/Typeahead.tsx
@@ -24,6 +24,9 @@ type NewEntry = {
   label: string;
 };
 
+export type TypeaheadElement<T extends TypeaheadModel = TypeaheadModel> =
+  BootstrapTypeahead<T>;
+
 const isNewEntry = (value: any): value is NewEntry => {
   return !!value?.customOption;
 };
@@ -65,7 +68,7 @@ const TypeaheadInner = <T extends TypeaheadModel>(
     isLoading,
     ...props
   }: Props<T>,
-  ref: ForwardedRef<HTMLInputElement>,
+  ref: ForwardedRef<BootstrapTypeahead<T>>,
 ) => {
   const { t } = useTranslation();
 
@@ -164,7 +167,7 @@ const TypeaheadInner = <T extends TypeaheadModel>(
 };
 
 const Typeahead = forwardRef(TypeaheadInner) as <T extends TypeaheadModel>(
-  props: Props<T> & { ref?: ForwardedRef<HTMLInputElement> },
+  props: Props<T> & { ref?: ForwardedRef<BootstrapTypeahead<T>> },
 ) => ReturnType<typeof TypeaheadInner<T>>;
 
 export type { NewEntry };