From e85d11e2092d5e7a69f932361fa9b2bc3d4d2a36 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Wed, 16 Aug 2023 23:17:59 -0500 Subject: [PATCH] fix typing --- web/src/lib/components/elements/dropdown.svelte | 11 ++++++----- web/src/routes/(user)/albums/+page.svelte | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/web/src/lib/components/elements/dropdown.svelte b/web/src/lib/components/elements/dropdown.svelte index 2feef233..a5c93d94 100644 --- a/web/src/lib/components/elements/dropdown.svelte +++ b/web/src/lib/components/elements/dropdown.svelte @@ -3,15 +3,16 @@ import LinkButton from './buttons/link-button.svelte'; import { clickOutside } from '$lib/utils/click-outside'; import { fly } from 'svelte/transition'; + import type Icon from 'svelte-material-icons/DotsVertical.svelte'; interface DropdownOption { value: string; - icon?: typeof LinkButton; + icon?: Icon; } - export let options: DropdownOption[] = []; + export let options: DropdownOption[] | string[] = []; export let value = options[0]; - export let icons: (typeof LinkButton)[] | undefined = undefined; + export let icons: (typeof Icon)[] | undefined = undefined; let showMenu = false; @@ -51,10 +52,10 @@ on:click={() => handleSelectOption(index)} > {#if value == option} -
+
-

+

{option}

{:else} diff --git a/web/src/routes/(user)/albums/+page.svelte b/web/src/routes/(user)/albums/+page.svelte index 4b4ac217..9cb2745a 100644 --- a/web/src/routes/(user)/albums/+page.svelte +++ b/web/src/routes/(user)/albums/+page.svelte @@ -25,6 +25,7 @@ NotificationType, } from '$lib/components/shared-components/notification/notification'; import type { AlbumResponseDto } from '@api'; + import type Icon from 'svelte-material-icons/DotsVertical.svelte'; export let data: PageData; @@ -40,7 +41,7 @@ }, ]; const viewOptionNames = viewOptions.map((option) => option.name); - const viewOptionIcons = viewOptions.map((option) => option.icon); + const viewOptionIcons: (typeof Icon)[] = viewOptions.map((option) => option.icon); const { albums: unsortedAlbums, @@ -151,7 +152,7 @@ {:else if $albumViewSettings.view === AlbumViewMode.List} @@ -161,11 +162,11 @@ {#each $albums as album (album.id)} goto(`albums/${album.id}`)} on:keydown={(event) => event.key === 'Enter' && goto(`albums/${album.id}`)} tabindex="0"
Album title