From e7635d8149aa71f8fa0fc34e6a7d4f3fa5e94ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C5=99i=C5=BEan?= Date: Sat, 13 Jun 2026 22:35:32 +0200 Subject: [PATCH] fix hydration mismatch in clock and countdown --- .../utilities/ClockCard/ClockCard.svelte | 61 +++--- .../CountdownCard/CountdownCard.svelte | 197 +++++++++--------- 2 files changed, 132 insertions(+), 126 deletions(-) diff --git a/src/lib/cards/utilities/ClockCard/ClockCard.svelte b/src/lib/cards/utilities/ClockCard/ClockCard.svelte index 12fb2722..d27460f1 100644 --- a/src/lib/cards/utilities/ClockCard/ClockCard.svelte +++ b/src/lib/cards/utilities/ClockCard/ClockCard.svelte @@ -3,6 +3,7 @@ import type { ContentComponentProps } from '../../types'; import type { ClockCardData } from './index'; import { onMount } from 'svelte'; + import { browser } from '$app/environment'; let { item }: ContentComponentProps = $props(); @@ -56,32 +57,34 @@ }); -
- -
- - : - - : - -
-
- {#if timezoneDisplay} -
- {timezoneDisplay} -
- {/if} -
+{#if browser} +
+ +
+ + : + + : + +
+
+ {#if timezoneDisplay} +
+ {timezoneDisplay} +
+ {/if} +
+{/if} diff --git a/src/lib/cards/utilities/CountdownCard/CountdownCard.svelte b/src/lib/cards/utilities/CountdownCard/CountdownCard.svelte index a1fa2f1b..df9ddb4c 100644 --- a/src/lib/cards/utilities/CountdownCard/CountdownCard.svelte +++ b/src/lib/cards/utilities/CountdownCard/CountdownCard.svelte @@ -3,6 +3,7 @@ import type { ContentComponentProps } from '../../types'; import type { CountdownCardData } from './index'; import { onMount } from 'svelte'; + import { browser } from '$app/environment'; let { item }: ContentComponentProps = $props(); @@ -66,120 +67,122 @@ ); -
- {#if isEventPast && elapsedDiff !== null} - - -
- {#if elapsedYears > 0} +{#if browser} +
+ {#if isEventPast && elapsedDiff !== null} + + +
+ {#if elapsedYears > 0} +
+ + {elapsedYears === 1 ? 'year' : 'years'} +
+ {/if} + {#if elapsedYears > 0 || elapsedDays > 0} +
+ + {elapsedDays === 1 ? 'day' : 'days'} +
+ {/if}
- {elapsedYears === 1 ? 'year' : 'years'} + hrs
- {/if} - {#if elapsedYears > 0 || elapsedDays > 0}
- {elapsedDays === 1 ? 'day' : 'days'} + min +
+
+ + sec
- {/if} -
- - hrs -
-
- - min -
-
- - sec
-
-
- {:else if eventDiff !== null} - - -
- {#if eventDays > 0} + + {:else if eventDiff !== null} + + +
+ {#if eventDays > 0} +
+ + {eventDays === 1 ? 'day' : 'days'} +
+ {/if}
- {eventDays === 1 ? 'day' : 'days'} + hrs +
+
+ + min +
+
+ + sec
- {/if} -
- - hrs -
-
- - min -
-
- - sec
-
-
- {:else} -
Set a target date in settings
- {/if} -
+
+ {:else} +
Set a target date in settings
+ {/if} +
+{/if}