fix: strange crash with {#if} branch for site data

This commit is contained in:
Xylight committed 2025-10-18 20:14:54 -07:00
1 parent 504df8458f
commit e026025ec4
3 files changed
+28 -28

No files matched your search

+1 -7
View File
@@ -27,13 +27,7 @@
class?: ClassValue class?: ClassValue
} }
let { let { site, taglines, admins, version, class: clazz = '' }: Props = $props()
site,
taglines = undefined,
admins = undefined,
version = undefined,
class: clazz = '',
}: Props = $props()
</script> </script>
<aside <aside
+4 -2
View File
@@ -156,8 +156,10 @@
<Blobs seed={title ?? data.text} /> <Blobs seed={title ?? data.text} />
</div> </div>
{/if} {/if}
<Icon src={data.icon} solid size="48" /> <Icon src={data.icon} solid size="40" />
<h1 class="font-display text-3xl font-medium text-left"> <h1
class="font-display text-xl md:text-2xl xl:text-3xl font-medium text-left overflow-hidden overflow-ellipsis line-clamp-2"
>
{title ?? data.text} {title ?? data.text}
</h1> </h1>
<div class="text-slate-600 dark:text-zinc-400"> <div class="text-slate-600 dark:text-zinc-400">
+23 -19
View File
@@ -149,24 +149,28 @@
<Navbar class={c} style={s} /> <Navbar class={c} style={s} />
{/snippet} {/snippet}
{#snippet suffix({ class: c })} {#snippet suffix({ class: c })}
{#if page.data.slots?.sidebar?.component} <!--strange issue, proabably to do with dynamic components-->
{@const SvelteComponent = page.data.slots.sidebar.component} <!--the {#if} branch for InstanceCard is getting rendered even if site.data is null, causing crashes-->
<SvelteComponent {#key site.data}
{...page.data.slots.sidebar.props} {#if page.data.slots?.sidebar?.component}
class={[c, 'p-3 sm:p-6']} {@const SvelteComponent = page.data.slots.sidebar.component}
/> <SvelteComponent
{:else if site.data} {...page.data.slots.sidebar.props}
<InstanceCard class={[c, 'p-3 sm:p-6']}
site={site.data.site_view} />
taglines={site.data.taglines} {:else if site.data?.site_view}
admins={site.data.admins} <InstanceCard
version={site.data.version} site={site.data.site_view}
class={[c, 'p-3 sm:p-6']} taglines={site.data.taglines}
/> admins={site.data.admins}
{:else} version={site.data.version}
<div class="h-64 w-full grid place-items-center"> class={[c, 'p-3 sm:p-6']}
<Spinner width={32} /> />
</div> {:else}
{/if} <div class="h-64 w-full grid place-items-center">
<Spinner width={32} />
</div>
{/if}
{/key}
{/snippet} {/snippet}
</Shell> </Shell>