Skip to content

fix hydration mismatch in clock and countdown #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flo-bit merged 1 commit into from
Jun 29, 2026
Merged

fix hydration mismatch in clock and countdown #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 32 additions & 29 deletions src/lib/cards/utilities/ClockCard/ClockCard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -56,32 +57,34 @@
});
</script>

<div class="@container flex h-full w-full flex-col items-center justify-center p-4">
<NumberFlowGroup>
<div
class="text-base-900 dark:text-base-100 accent:text-base-900 flex items-center text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
style="font-variant-numeric: tabular-nums;"
>
<NumberFlow value={clockHours} format={{ minimumIntegerDigits: 2 }} />
<span class="text-base-400 dark:text-base-500 accent:text-accent-950 mx-0.5">:</span>
<NumberFlow
value={clockMinutes}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
trend={1}
/>
<span class="text-base-400 dark:text-base-500 accent:text-accent-950 mx-0.5">:</span>
<NumberFlow
value={clockSeconds}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
trend={1}
/>
</div>
</NumberFlowGroup>
{#if timezoneDisplay}
<div class="text-base-500 dark:text-base-400 accent:text-base-600 mt-1 text-xs @sm:text-sm">
{timezoneDisplay}
</div>
{/if}
</div>
{#if browser}
<div class="@container flex h-full w-full flex-col items-center justify-center p-4">
<NumberFlowGroup>
<div
class="text-base-900 dark:text-base-100 accent:text-base-900 flex items-center text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
style="font-variant-numeric: tabular-nums;"
>
<NumberFlow value={clockHours} format={{ minimumIntegerDigits: 2 }} />
<span class="text-base-400 dark:text-base-500 accent:text-accent-950 mx-0.5">:</span>
<NumberFlow
value={clockMinutes}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
trend={1}
/>
<span class="text-base-400 dark:text-base-500 accent:text-accent-950 mx-0.5">:</span>
<NumberFlow
value={clockSeconds}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
trend={1}
/>
</div>
</NumberFlowGroup>
{#if timezoneDisplay}
<div class="text-base-500 dark:text-base-400 accent:text-base-600 mt-1 text-xs @sm:text-sm">
{timezoneDisplay}
</div>
{/if}
</div>
{/if}
197 changes: 100 additions & 97 deletions src/lib/cards/utilities/CountdownCard/CountdownCard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -66,120 +67,122 @@
);
</script>

<div class="@container flex h-full w-full flex-col items-center justify-center p-4">
{#if isEventPast && elapsedDiff !== null}
<!-- Elapsed time since past event -->
<NumberFlowGroup>
<div
class="text-base-900 dark:text-base-100 accent:text-base-900 flex items-baseline gap-4 text-center @sm:gap-6 @md:gap-8"
style="font-variant-numeric: tabular-nums;"
>
{#if elapsedYears > 0}
{#if browser}
<div class="@container flex h-full w-full flex-col items-center justify-center p-4">
{#if isEventPast && elapsedDiff !== null}
<!-- Elapsed time since past event -->
<NumberFlowGroup>
<div
class="text-base-900 dark:text-base-100 accent:text-base-900 flex items-baseline gap-4 text-center @sm:gap-6 @md:gap-8"
style="font-variant-numeric: tabular-nums;"
>
{#if elapsedYears > 0}
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedYears}
trend={1}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs"
>{elapsedYears === 1 ? 'year' : 'years'}</span
>
</div>
{/if}
{#if elapsedYears > 0 || elapsedDays > 0}
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedDays}
trend={1}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs"
>{elapsedDays === 1 ? 'day' : 'days'}</span
>
</div>
{/if}
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedYears}
value={elapsedHours}
trend={1}
format={{ minimumIntegerDigits: 2 }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs"
>{elapsedYears === 1 ? 'year' : 'years'}</span
>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">hrs</span>
</div>
{/if}
{#if elapsedYears > 0 || elapsedDays > 0}
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedDays}
value={elapsedMinutes}
trend={1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs"
>{elapsedDays === 1 ? 'day' : 'days'}</span
>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">min</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedSeconds}
trend={1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">sec</span>
</div>
{/if}
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedHours}
trend={1}
format={{ minimumIntegerDigits: 2 }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">hrs</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedMinutes}
trend={1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">min</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={elapsedSeconds}
trend={1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">sec</span>
</div>
</div>
</NumberFlowGroup>
{:else if eventDiff !== null}
<!-- Countdown to future event -->
<NumberFlowGroup>
<div
class="text-base-900 dark:text-base-100 accent:text-base-900 flex items-baseline gap-4 text-center @sm:gap-6 @md:gap-8"
style="font-variant-numeric: tabular-nums;"
>
{#if eventDays > 0}
</NumberFlowGroup>
{:else if eventDiff !== null}
<!-- Countdown to future event -->
<NumberFlowGroup>
<div
class="text-base-900 dark:text-base-100 accent:text-base-900 flex items-baseline gap-4 text-center @sm:gap-6 @md:gap-8"
style="font-variant-numeric: tabular-nums;"
>
{#if eventDays > 0}
<div class="flex flex-col items-center">
<NumberFlow
value={eventDays}
trend={-1}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs"
>{eventDays === 1 ? 'day' : 'days'}</span
>
</div>
{/if}
<div class="flex flex-col items-center">
<NumberFlow
value={eventDays}
value={eventHours}
trend={-1}
format={{ minimumIntegerDigits: 2 }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs"
>{eventDays === 1 ? 'day' : 'days'}</span
>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">hrs</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={eventMinutes}
trend={-1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">min</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={eventSeconds}
trend={-1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">sec</span>
</div>
{/if}
<div class="flex flex-col items-center">
<NumberFlow
value={eventHours}
trend={-1}
format={{ minimumIntegerDigits: 2 }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">hrs</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={eventMinutes}
trend={-1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">min</span>
</div>
<div class="flex flex-col items-center">
<NumberFlow
value={eventSeconds}
trend={-1}
format={{ minimumIntegerDigits: 2 }}
digits={{ 1: { max: 5 } }}
class="text-3xl font-bold @xs:text-4xl @sm:text-5xl @md:text-6xl @lg:text-7xl"
/>
<span class="text-base-500 dark:text-base-400 accent:text-accent-950 text-xs">sec</span>
</div>
</div>
</NumberFlowGroup>
{:else}
<div class="text-base-500 text-sm">Set a target date in settings</div>
{/if}
</div>
</NumberFlowGroup>
{:else}
<div class="text-base-500 text-sm">Set a target date in settings</div>
{/if}
</div>
{/if}