misc: split post media into separate component

This commit is contained in:
Xyphyn committed 2023-10-11 17:47:23 -07:00
1 parent c1c138680d
commit 9d48198f95
5 files changed
+141 -121

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "photon-lemmy", "name": "photon-lemmy",
"version": "1.19.1", "version": "1.19.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
+7 -118
View File
@@ -13,6 +13,8 @@
import Empty from '$lib/components/helper/Empty.svelte' import Empty from '$lib/components/helper/Empty.svelte'
import { publishedToDate } from '$lib/components/util/date.js' import { publishedToDate } from '$lib/components/util/date.js'
import { Icon, VideoCamera } from 'svelte-hero-icons' import { Icon, VideoCamera } from 'svelte-hero-icons'
import PostMedia from '$lib/components/lemmy/post/media/PostMedia.svelte'
import PostMediaCompact from '$lib/components/lemmy/post/media/PostMediaCompact.svelte'
export let post: PostView export let post: PostView
export let actions: boolean = true export let actions: boolean = true
@@ -23,24 +25,16 @@
</script> </script>
<Material <Material
color="distinct" color={view != 'card' ? 'none' : 'distinct'}
padding="none" padding="none"
class="relative max-w-full min-w-0 w-full group class="relative max-w-full min-w-0 w-full group
{view != 'card' ? '!bg-transparent !border-0' : 'p-5'} {view == 'compact' {view != 'card' ? 'bg-transparent !border-0' : 'p-5'} {view == 'compact'
? 'py-4' ? 'py-4'
: view == 'list' : view == 'list'
? 'py-5' ? 'py-5'
: 'py-5'}" : 'py-5'}"
id={post.post.id} id={post.post.id}
> >
<!-- svelte-ignore a11y-no-static-element-interactions -->
<!-- svelte-ignore a11y-click-events-have-key-events -->
{#if view == 'list' || view == 'cozy'}
<div
class="absolute -inset-x-2 md:-inset-x-4 inset-y-2 scale-95 opacity-0 bg-slate-50 dark:bg-zinc-900
-z-10 rounded-xl group-hover:opacity-100 group-hover:scale-100 transition-all"
/>
{/if}
<div <div
class="flex {$userSettings.leftAlign class="flex {$userSettings.leftAlign
? 'flex-row-reverse' ? 'flex-row-reverse'
@@ -73,92 +67,7 @@
</a> </a>
{/if} {/if}
</div> </div>
{#if isImage(post.post.url)} <PostMedia bind:post={post.post} {view} />
{#if view == 'card' || view == 'cozy'}
<!--disabled preloads here since most people will hover over every image while scrolling-->
<svelte:component
this={$userSettings.expandImages ? ExpandableImage : Empty}
url={bestImageURL(post.post, false, 2048)}
class="container mx-auto w-fit"
>
<svelte:element
this={$userSettings.expandImages ? 'div' : 'a'}
href={postLink(post.post)}
class="container mx-auto z-10 transition-colors rounded-xl max-h-[60vh] relative overflow-hidden"
data-sveltekit-preload-data="off"
aria-label={post.post.name}
>
<picture
class="absolute top-1/2 -translate-y-1/2 left-0 w-full
opacity-30 object-cover scale-[1.2] blur-3xl -z-10"
>
<source
srcset={bestImageURL(post.post, false, 512)}
media="(max-width: 256px)"
/>
<source
srcset={bestImageURL(post.post, false, 512)}
media="(max-width: 512px)"
/>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post.post, false, 1024)}
loading="lazy"
class="w-full h-full object-cover rounded-xl blur-3xl z-50"
width={512}
height={300}
class:blur-3xl={post.post.nsfw && $userSettings.nsfwBlur}
on:load={() => (loaded = true)}
/>
</picture>
<picture class="max-h-[inherit]">
<source
srcset={bestImageURL(post.post, false, 512)}
media="(max-width: 256px)"
/>
<source
srcset={bestImageURL(post.post, false, 512)}
media="(max-width: 512px)"
/>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post.post, false, 1024)}
loading="lazy"
class="max-h-[inherit] max-w-full h-auto z-30
transition-opacity duration-300 object-contain mx-auto"
width={512}
height={300}
class:blur-3xl={post.post.nsfw && $userSettings.nsfwBlur}
on:load={() => (loaded = true)}
/>
</picture>
</svelte:element>
</svelte:component>
{/if}
{:else if isVideo(post.post.url) && (view == 'cozy' || view == 'card')}
<a
href={postLink(post.post)}
style="height: 300px;"
class="w-full rounded-xl flex flex-col items-center justify-center relative z-0 overflow-hidden
text-white p-4"
>
<div
class="absolute blur-xl -z-10 top-0 left-0 w-full h-full bg-gradient-to-br from-green-800 via-blue-900 via-20% to-red-700"
/>
<Icon src={VideoCamera} solid size="48" />
<span class="font-bold text-2xl">Video</span>
<p class="text-base">Go to the post to view this video.</p>
</a>
{:else if post.post.url}
<PostLink
url={post.post.url}
thumbnail_url={post.post.thumbnail_url}
nsfw={post.post.nsfw}
embed_description={post.post.embed_description}
embed_title={post.post.embed_title}
compact={view == 'compact'}
/>
{/if}
{#if post.post.body && !post.post.nsfw && view != 'compact'} {#if post.post.body && !post.post.nsfw && view != 'compact'}
<div <div
class="text-sm relative overflow-hidden class="text-sm relative overflow-hidden
@@ -170,28 +79,8 @@
</div> </div>
{/if} {/if}
</div> </div>
{#if (view == 'list' || view == 'compact') && !post.post.embed_title && (post.post.thumbnail_url || isImage(post.post.url))} {#if view == 'list' || view == 'compact'}
<div class="flex-shrink-0 w-24 h-24"> <PostMediaCompact {view} bind:post={post.post} />
{#if !$userSettings.expandImages || (post.post.thumbnail_url && !isImage(post.post.url))}
<a href={postLink(post.post)}>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post.post, true)}
loading="lazy"
class="object-cover bg-slate-100 dark:bg-zinc-800 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
/>
</a>
{:else}
<ExpandableImage url={bestImageURL(post.post, false, 2048)}>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post.post, true)}
loading="lazy"
class="object-cover bg-slate-100 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
/>
</ExpandableImage>
{/if}
</div>
{/if} {/if}
</div> </div>
{#if actions} {#if actions}
@@ -0,0 +1,97 @@
<script lang="ts">
import Empty from '$lib/components/helper/Empty.svelte'
import PostLink from '$lib/components/lemmy/post/PostLink.svelte'
import { bestImageURL, postLink } from '$lib/components/lemmy/post/helpers.js'
import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte'
import { userSettings } from '$lib/settings.js'
import { isImage, isVideo } from '$lib/ui/image'
import type { Post } from 'lemmy-js-client'
import { Icon, VideoCamera } from 'svelte-hero-icons'
export let view: 'card' | 'cozy' | 'list' | 'compact' = 'cozy'
export let post: Post
</script>
{#if isImage(post.url)}
{#if view == 'card' || view == 'cozy'}
<!--disabled preloads here since most people will hover over every image while scrolling-->
<svelte:component
this={$userSettings.expandImages ? ExpandableImage : Empty}
url={bestImageURL(post, false, 2048)}
class="container mx-auto w-fit"
>
<svelte:element
this={$userSettings.expandImages ? 'div' : 'a'}
href={postLink(post)}
class="container mx-auto z-10 transition-colors rounded-xl max-h-[60vh] relative overflow-hidden"
data-sveltekit-preload-data="off"
aria-label={post.name}
>
<picture
class="absolute top-1/2 -translate-y-1/2 left-0 w-full
opacity-30 object-cover scale-[1.2] blur-3xl -z-10"
>
<source
srcset={bestImageURL(post, false, 512)}
media="(max-width: 256px)"
/>
<source
srcset={bestImageURL(post, false, 512)}
media="(max-width: 512px)"
/>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post, false, 1024)}
loading="lazy"
class="w-full h-full object-cover rounded-xl blur-3xl z-50"
width={512}
height={300}
/>
</picture>
<picture class="max-h-[inherit]">
<source
srcset={bestImageURL(post, false, 512)}
media="(max-width: 256px)"
/>
<source
srcset={bestImageURL(post, false, 512)}
media="(max-width: 512px)"
/>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post, false, 1024)}
loading="lazy"
class="max-h-[inherit] max-w-full h-auto z-30
transition-opacity duration-300 object-contain mx-auto"
width={512}
height={300}
class:blur-3xl={post.nsfw && $userSettings.nsfwBlur}
/>
</picture>
</svelte:element>
</svelte:component>
{/if}
{:else if isVideo(post.url) && (view == 'cozy' || view == 'card')}
<a
href={postLink(post)}
style="height: 300px;"
class="w-full rounded-xl flex flex-col items-center justify-center relative z-0 overflow-hidden
text-white p-4"
>
<div
class="absolute blur-xl -z-10 top-0 left-0 w-full h-full bg-gradient-to-br from-green-800 via-blue-900 via-20% to-red-700"
/>
<Icon src={VideoCamera} solid size="48" />
<span class="font-bold text-2xl">Video</span>
<p class="text-base">Go to the post to view this video.</p>
</a>
{:else if post.url}
<PostLink
url={post.url}
thumbnail_url={post.thumbnail_url}
nsfw={post.nsfw}
embed_description={post.embed_description}
embed_title={post.embed_title}
compact={view == 'compact'}
/>
{/if}
@@ -0,0 +1,34 @@
<script lang="ts">
import { bestImageURL, postLink } from '$lib/components/lemmy/post/helpers.js'
import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte'
import { userSettings } from '$lib/settings.js'
import { isImage } from '$lib/ui/image'
import type { Post } from 'lemmy-js-client'
export let view: 'card' | 'cozy' | 'list' | 'compact' = 'cozy'
export let post: Post
</script>
{#if (view == 'list' || view == 'compact') && !post.embed_title && (post.thumbnail_url || isImage(post.url))}
<div class="flex-shrink-0 w-24 h-24">
{#if !$userSettings.expandImages || (post.thumbnail_url && !isImage(post.url))}
<a href={postLink(post)}>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post, true)}
loading="lazy"
class="object-cover bg-slate-100 dark:bg-zinc-800 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
/>
</a>
{:else}
<ExpandableImage url={bestImageURL(post, false, 2048)}>
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={bestImageURL(post, true)}
loading="lazy"
class="object-cover bg-slate-100 rounded-md h-24 w-24 border border-slate-200 dark:border-zinc-700"
/>
</ExpandableImage>
{/if}
</div>
{/if}
+2 -2
View File
@@ -24,14 +24,14 @@
<!-- svelte-ignore a11y-click-events-have-key-events --> <!-- svelte-ignore a11y-click-events-have-key-events -->
<!-- svelte-ignore a11y-positive-tabindex --> <!-- svelte-ignore a11y-positive-tabindex -->
<div <div
class="isolate fixed backdrop-blur-sm top-0 left-0 w-screen h-screen overflow-auto bg-black/50 class="!isolate fixed backdrop-blur-sm top-0 left-0 w-screen h-screen overflow-auto bg-black/50
flex flex-col z-[200] overscroll-contain" flex flex-col z-[200] overscroll-contain"
transition:fade={{ duration: 200 }} transition:fade={{ duration: 200 }}
on:click={() => (open = false)} on:click={() => (open = false)}
> >
<Button <Button
size="square-md" size="square-md"
class="absolute z-[110] top-0 right-0 m-4" class="fixed z-[110] top-0 right-0 m-4"
on:click={() => (open = false)} on:click={() => (open = false)}
> >
<Icon src={XMark} size="16" mini slot="prefix" /> <Icon src={XMark} size="16" mini slot="prefix" />