Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/ui/PodcastView/EpisodeListItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
src={episode.artworkUrl}
alt={episode.title}
fadeIn={true}
width="5rem"
height="5rem"
class="podcast-episode-thumbnail"
/>
</div>
Expand Down
15 changes: 9 additions & 6 deletions src/ui/common/Image.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
export let fadeIn: boolean = false;
export let opacity: number = 0; // Falsey value so condition isn't triggered if not set.
export let interactive: boolean = false;
export let loading: "lazy" | "eager" | null | undefined = undefined;
export {_class as class};
let _class = "";

let loaded = false;
let loading = true;
let isLoading = true;
let failed = false;

const dispatcher = createEventDispatcher();
Expand All @@ -20,7 +21,7 @@
}
</script>

{#if loading || loaded}
{#if isLoading || loaded}
{#if interactive}
<button
type="button"
Expand All @@ -31,11 +32,12 @@
draggable="false"
{src}
{alt}
{loading}
class={_class}
style:opacity={opacity ? opacity : !fadeIn ? 1 : loaded ? 1 : 0}
style:transition={fadeIn ? "opacity 0.5s ease-out" : ""}
on:load={() => {loaded = true; loading = false;}}
on:error={() => {failed = true; loading = false;}}
on:load={() => {loaded = true; isLoading = false;}}
on:error={() => {failed = true; isLoading = false;}}
/>
</button>
{:else}
Expand All @@ -44,11 +46,12 @@
draggable="false"
{src}
{alt}
{loading}
class={_class}
style:opacity={opacity ? opacity : !fadeIn ? 1 : loaded ? 1 : 0}
style:transition={fadeIn ? "opacity 0.5s ease-out" : ""}
on:load={() => {loaded = true; loading = false;}}
on:error={() => {failed = true; loading = false;}}
on:load={() => {loaded = true; isLoading = false;}}
on:error={() => {failed = true; isLoading = false;}}
/>
</div>
{/if}
Expand Down
46 changes: 33 additions & 13 deletions src/ui/common/ImageLoader.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,46 @@
export let alt: string;
export let fadeIn: boolean = false;
export let interactive: boolean = false;
export let width: string | number | undefined;
export let height: string | number | undefined;
export let aspectRatio: string | undefined = "1 / 1";
export { _class as class };

let _class: string = "";

import IntersectionObserver from "./IntersectionObserver.svelte";
import Image from "./Image.svelte";
import { createEventDispatcher } from "svelte";

const dispatcher = createEventDispatcher();

const toDimension = (value?: string | number) =>
typeof value === "number" ? `${value}px` : value;

$: resolvedWidth = toDimension(width);
$: resolvedHeight = toDimension(height);
$: resolvedAspectRatio = resolvedHeight ? undefined : aspectRatio;
</script>

<IntersectionObserver once={true} let:intersecting>
{#if intersecting}
<Image
{alt}
{src}
{fadeIn}
{interactive}
on:click={event => dispatcher('click', { event })}
class={_class}
/>
{/if}
</IntersectionObserver>
<div
class="image-loader"
style:width={resolvedWidth}
style:height={resolvedHeight}
style:aspect-ratio={resolvedAspectRatio}
>
<Image
{alt}
{src}
{fadeIn}
{interactive}
loading="lazy"
on:click={event => dispatcher('click', { event })}
class={_class}
/>
</div>

<style>
.image-loader {
position: relative;
width: 100%;
}
</style>