Lib: Add imgwidth/imgheight to Card component so layout doesn't jump when lazyloading images

This commit is contained in:
2024-12-16 02:28:31 +01:00
parent 0d25f23818
commit 72154656fb
5 changed files with 33 additions and 10 deletions

View File

@ -1,5 +1,6 @@
<script lang="ts">
import type { Snippet } from "svelte";
import LazyImage from "./LazyImage.svelte";
interface CardProps {
children: Snippet;
@ -10,6 +11,12 @@
/** The id of the header image element for JS access. */
imgid?: string | undefined;
/** The aspect ratio width used to reserve image space (while its loading) */
imgwidth?: number;
/** The aspect ratio height used to reserve image space (while its loading) */
imgheight?: number;
/** Hide the header image element. It can be shown by removing the "hidden" property using JS and the imgid. */
imghidden?: boolean;
@ -21,6 +28,8 @@
children,
imgsrc = undefined,
imgid = undefined,
imgwidth = undefined,
imgheight = undefined,
imghidden = false,
fullwidth = false,
...restProps
@ -30,14 +39,16 @@
<div class="card overflow-hidden bg-white shadow {fullwidth ? 'w-full' : 'w-auto'}">
<!-- Allow empty strings for images that only appear after user action -->
{#if imgsrc !== undefined}
<img
id={imgid}
src={imgsrc}
alt="Card header"
draggable="false"
class="select-none shadow"
hidden={imghidden}
/>
<div style="width: auto; aspect-ratio: {imgwidth} / {imgheight};">
<LazyImage
id={imgid}
src={imgsrc}
alt="Card header"
draggable="false"
class="select-none shadow"
hidden={imghidden}
/>
</div>
{/if}
<div class="p-2" {...restProps}>
{@render children()}

View File

@ -6,6 +6,7 @@
import type { Driver } from "$lib/schema";
import Input from "./Input.svelte";
import Dropdown, { type DropdownOption } from "./Dropdown.svelte";
import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
interface DriverCardProps {
/** The [Driver] object used to prefill values. */
@ -34,7 +35,7 @@
driver = undefined,
disable_inputs = false,
require_inputs = false,
headshot_template = "",
headshot_template = undefined,
team_select_value,
team_select_options,
active_value,
@ -43,6 +44,8 @@
<Card
imgsrc={driver?.headshot_url ?? headshot_template}
imgwidth={DRIVER_HEADSHOT_WIDTH}
imgheight={DRIVER_HEADSHOT_HEIGHT}
imgid="update_driver_headshot_preview_{driver?.id ?? 'create'}"
>
<form method="POST" enctype="multipart/form-data">

View File

@ -6,6 +6,7 @@
import type { Race } from "$lib/schema";
import Input from "./Input.svelte";
import { format } from "date-fns";
import { RACE_PICTOGRAM_HEIGHT, RACE_PICTOGRAM_WIDTH } from "$lib/config";
interface RaceCardProps {
/** The [Race] object used to prefill values. */
@ -56,6 +57,8 @@
<Card
imgsrc={race?.pictogram_url ?? pictogram_template}
imgwidth={RACE_PICTOGRAM_WIDTH}
imgheight={RACE_PICTOGRAM_HEIGHT}
imgid="update_race_pictogram_preview_{race?.id ?? 'create'}"
>
<form method="POST" enctype="multipart/form-data">

View File

@ -5,6 +5,7 @@
import { get_by_value } from "$lib/database";
import Dropdown, { type DropdownOption } from "./Dropdown.svelte";
import type { Action } from "svelte/action";
import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
interface SubstitutionCardProps {
/** The [Substitution] object used to prefill values. */
@ -70,7 +71,7 @@
`update_substitution_headshot_preview_${substitution?.id ?? "create"}`,
) as HTMLImageElement;
preview.src = src;
if (preview) preview.src = src;
}
};
</script>
@ -78,6 +79,8 @@
<Card
imgsrc={get_by_value(drivers, "id", substitution?.substitute ?? "")?.headshot_url ??
headshot_template}
imgwidth={DRIVER_HEADSHOT_WIDTH}
imgheight={DRIVER_HEADSHOT_HEIGHT}
imgid="update_substitution_headshot_preview_{substitution?.id ?? 'create'}"
>
<form method="POST" enctype="multipart/form-data">

View File

@ -5,6 +5,7 @@
import Button from "./Button.svelte";
import type { Team } from "$lib/schema";
import Input from "./Input.svelte";
import { TEAM_LOGO_HEIGHT, TEAM_LOGO_WIDTH } from "$lib/config";
interface TeamCardProps {
/** The [Team] object used to prefill values. */
@ -30,6 +31,8 @@
<Card
imgsrc={team?.logo_url ?? logo_template}
imgwidth={TEAM_LOGO_WIDTH}
imgheight={TEAM_LOGO_HEIGHT}
imgid="update_team_logo_preview_{team?.id ?? 'create'}"
>
<form method="POST" enctype="multipart/form-data">