From c37d1789d62542fdac07ade647c87e87f4c34d6b Mon Sep 17 00:00:00 2001 From: James Xylight Date: Thu, 13 Feb 2025 16:12:33 -0800 Subject: [PATCH] fix: ssr crashes --- src/lib/components/ui/layout/Shell.svelte | 10 +++++----- src/lib/lemmy.svelte.ts | 4 ++-- src/lib/ui/colors.svelte.ts | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index 5c019dc8..cd17b2b3 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -82,6 +82,11 @@ top: boolean }>(dockProps) + let sidePadding = $derived( + calculatePadding(dockProps.noGap, dockProps.top, false), + ) + let topPanel = $derived(dockProps.noGap && dockProps.top) + export { contentPaddingStore as contentPadding, dockPropsStore as dockProps } @@ -113,11 +118,6 @@ ...rest }: Props = $props() - let sidePadding = $derived( - calculatePadding(dockProps.noGap, dockProps.top, false), - ) - let topPanel = $derived(dockProps.noGap && dockProps.top) - $effect(() => { contentPaddingStore.set(contentPadding) dockPropsStore.set(dockProps) diff --git a/src/lib/lemmy.svelte.ts b/src/lib/lemmy.svelte.ts index 530bf189..0345d07d 100644 --- a/src/lib/lemmy.svelte.ts +++ b/src/lib/lemmy.svelte.ts @@ -1,7 +1,7 @@ import { type GetSiteResponse, LemmyHttp } from 'lemmy-js-client' import { get, writable } from 'svelte/store' import { error } from '@sveltejs/kit' -import { instance } from '$lib/instance.svelte.js' +import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.svelte.js' import { instanceToURL } from '$lib/util.svelte' import { profile } from '$lib/auth.svelte' import { toast } from 'mono-svelte' @@ -69,7 +69,7 @@ export function client({ ) => Promise auth?: string } = {}) { - if (!instanceURL) instanceURL = profile.data.instance + if (!instanceURL) instanceURL = profile.data.instance || DEFAULT_INSTANCE_URL let jwt = auth ? auth : profile.data?.jwt diff --git a/src/lib/ui/colors.svelte.ts b/src/lib/ui/colors.svelte.ts index bd8e96a8..c67b5e0d 100644 --- a/src/lib/ui/colors.svelte.ts +++ b/src/lib/ui/colors.svelte.ts @@ -111,9 +111,10 @@ const configuredColorScheme = env.PUBLIC_COLORSCHEME ?? 'system' class ThemeState { constructor() { - const localColorScheme: ColorScheme = - (localStorage.getItem('colorScheme') as ColorScheme) || - configuredColorScheme + const localColorScheme: ColorScheme = browser + ? (localStorage.getItem('colorScheme') as ColorScheme) || + configuredColorScheme + : (configuredColorScheme as ColorScheme) this.#colorScheme = localColorScheme }