Merge pull request #625 from Xyphyn/revert-624-optimizations

Revert "perf: improve efficiency and performance"
This commit is contained in:
Xylight authored and GitHub committed 2025-08-01 21:26:14 +00:00
commit 9056e6083d
32 files changed
+470 -248

No files matched your search

BIN
View File
Binary file not shown.
+2
View File
@@ -14,6 +14,7 @@
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/postcss": "^4.1.8",
"@types/nprogress": "^0.2.0",
"@types/ua-parser-js": "^0.7.39",
"eslint": "^9.28.0",
"eslint-plugin-svelte": "^3.9.1",
@@ -22,6 +23,7 @@
"linkify-it": "^5.0.0",
"marked": "7.0.5",
"marked-linkify-it": "^3.1.10",
"nprogress": "^0.2.0",
"postcss": "^8.4.30",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.7",
@@ -1,5 +1,4 @@
import type { Comment, CommentView } from 'lemmy-js-client'
import { SvelteMap } from 'svelte/reactivity'
export interface CommentNodeI {
comment_view: CommentView
@@ -29,7 +28,7 @@ export function buildCommentsTree(
baseDepth: number = 0,
filter: (c: CommentView) => boolean = () => true,
): CommentNodeI[] {
const map = new SvelteMap<number, CommentNodeI>()
const map = new Map<number, CommentNodeI>()
let min_depth = Number.MAX_VALUE
for (const comment_view of comments) {
@@ -2,11 +2,9 @@
import { profile } from '$lib/auth.svelte.js'
import { t } from '$lib/i18n/translations'
import { getClient } from '$lib/lemmy.svelte'
import { errorMessage } from '$lib/lemmy/error'
import { isCommentView, isPostView } from '$lib/lemmy/item.js'
import type { CommentView, PostView } from 'lemmy-js-client'
import { Menu, MenuButton, MenuDivider, toast } from 'mono-svelte'
import type { Snippet } from 'svelte'
import { Button, Menu, MenuButton, MenuDivider, toast } from 'mono-svelte'
import {
ArrowsUpDown,
Fire,
@@ -19,19 +17,23 @@
Trash,
} from 'svelte-hero-icons'
import { amMod, ban, isAdmin, remove, viewVotes } from './moderation'
import ShieldIcon from './ShieldIcon.svelte'
import { errorMessage } from '$lib/lemmy/error'
interface Props {
item: PostView | CommentView
target: Snippet<[boolean]>
}
let { item = $bindable(), target: passedTarget }: Props = $props()
let { item = $bindable(), ...rest }: Props = $props()
let acting = $state(false)
let locking = $state(false)
let pinning = $state(false)
let acting = $derived(locking || pinning)
async function lock(lock: boolean) {
if (!profile.current?.jwt || !isPostView(item)) return
acting = true
locking = true
try {
await getClient().lockPost({
@@ -47,13 +49,13 @@
})
}
acting = false
locking = false
}
async function pin(pinned: boolean, toInstance: boolean = false) {
if (!profile.current?.jwt || !isPostView(item)) return
acting = true
pinning = true
try {
await getClient().featurePost({
@@ -70,13 +72,21 @@
})
}
acting = false
pinning = false
}
</script>
<Menu placement="bottom-end">
{#snippet target()}
{@render passedTarget(acting)}
<Button
class="hover:text-green-500!"
size="square-md"
color="ghost"
loading={acting}
{...rest}
>
<ShieldIcon filled width={16} />
</Button>
{/snippet}
{#if (profile.current?.user && amMod(profile.current.user, item.community)) || (profile.current?.user && isAdmin(profile.current.user))}
<MenuDivider>
@@ -89,7 +99,8 @@
<MenuButton
color="warning-subtle"
onclick={() => lock(!item.post.locked)}
loading={acting}
loading={locking}
disabled={locking}
>
{#snippet prefix()}
<Icon src={item.post.locked ? LockOpen : LockClosed} size="16" mini />
@@ -101,7 +112,8 @@
color="success-subtle"
onclick={() =>
pin(isPostView(item) ? !item.post.featured_community : false)}
loading={acting}
loading={pinning}
disabled={pinning}
>
<Icon src={Megaphone} size="16" mini />
<div
+20 -1
View File
@@ -1,6 +1,7 @@
<script lang="ts">
import { goto } from '$app/navigation'
import { profile } from '$lib/auth.svelte'
import { mediaType } from '$lib/components/lemmy/post/helpers.js'
import { mediaType, postLink } from '$lib/components/lemmy/post/helpers.js'
import PostMedia from '$lib/components/lemmy/post/media/PostMedia.svelte'
import PostMediaCompact from '$lib/components/lemmy/post/media/PostMediaCompact.svelte'
import PostActions from '$lib/components/lemmy/post/PostActions.svelte'
@@ -27,6 +28,15 @@
return rule
}
function onClick(e: Event) {
const event = e as Event
const parent = document.getElementById(post.post.id.toString())
if (event.target == parent) {
goto(postLink(post.post))
}
}
interface Props {
post: PostView
actions?: boolean
@@ -76,6 +86,8 @@
This is the sole component for displaying posts.
It adapts to all kinds of form factors for different contexts, such as feeds, full post view, and crosspost list.
-->
<!-- svelte-ignore a11y_no_static_element_interactions -->
<!-- svelte-ignore a11y_no_noninteractive_tabindex -->
<div
class={[
'post relative max-w-full min-w-0 w-full cursor-pointer outline-hidden group',
@@ -85,6 +97,13 @@
clazz,
]}
id={post.post.id.toString()}
onclick={e => {
onClick(e)
}}
onkeydown={e => {
if (e.key == 'Enter') onClick(e)
}}
tabindex="0"
{style}
>
<PostMeta
@@ -6,6 +6,7 @@
isAdmin,
report,
} from '$lib/components/lemmy/moderation/moderation.js'
import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte'
import TextProps from '$lib/components/ui/text/TextProps.svelte'
import { publishedToDate } from '$lib/components/util/date'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
@@ -45,7 +46,6 @@
Newspaper,
PencilSquare,
Share,
ShieldCheck,
Trash,
UserCircle,
XMark,
@@ -161,21 +161,14 @@
</Button>
{/if}
{#if profile.current?.user && (amMod(profile.current.user, post.community) || isAdmin(profile.current.user))}
{#await import('$lib/components/lemmy/moderation/ModerationMenu.svelte') then { default: ModerationMenu }}
<ModerationMenu bind:item={post}>
{#snippet target(acting)}
<Button
color="ghost"
rounding="pill"
loading={acting}
class={buttonSquare}
size="custom"
>
<Icon src={ShieldCheck} size="18" mini />
</Button>
{/snippet}
</ModerationMenu>
{/await}
<ModerationMenu
size="custom"
color="ghost"
rounding="pill"
class={buttonSquare}
bind:item={post}
community={post.community}
/>
{/if}
{#if profile.current?.jwt}
@@ -6,7 +6,7 @@
post: PostView
}
let { post }: Props = $props()
let { post } = $props()
</script>
<Post {post} class="py-0!" />
+75 -83
View File
@@ -1,14 +1,4 @@
<script lang="ts" module>
type BadgeType =
| 'nsfw'
| 'saved'
| 'featured'
| 'deleted'
| 'removed'
| 'locked'
| 'moderator'
| 'admin'
export interface Tag {
content: string
color?: string
@@ -66,11 +56,11 @@
import { settings, type View } from '$lib/settings.svelte'
import type { Community, Person, SubscribedType } from 'lemmy-js-client'
import { Badge, Popover } from 'mono-svelte'
import Material from 'mono-svelte/materials/Material.svelte'
import {
Bookmark,
ExclamationTriangle,
Icon,
LockClosed,
Megaphone,
PaperAirplane,
Pencil,
@@ -80,64 +70,7 @@
} from 'svelte-hero-icons'
import CommunityHeader from '../community/CommunityHeader.svelte'
import ShieldIcon from '../moderation/ShieldIcon.svelte'
const badgeToData: Map<
BadgeType,
{
icon: IconSource
color: 'red-subtle' | 'yellow-subtle' | 'green-subtle'
label: string
}
> = new Map([
[
'nsfw',
{
icon: ExclamationTriangle,
color: 'red-subtle',
label: t.get('post.badges.nsfw'),
},
],
[
'saved',
{
icon: Bookmark,
color: 'yellow-subtle',
label: t.get('post.badges.saved'),
},
],
[
'featured',
{
icon: Megaphone,
color: 'green-subtle',
label: t.get('post.badges.featured'),
},
],
[
'removed',
{
icon: Trash,
color: 'green-subtle',
label: t.get('post.badges.removed'),
},
],
[
'deleted',
{
icon: Trash,
color: 'red-subtle',
label: t.get('post.badges.deleted'),
},
],
[
'locked',
{
icon: Lock,
color: 'yellow-subtle',
label: t.get('post.badges.locked'),
},
],
])
import Material from 'mono-svelte/materials/Material.svelte'
interface Props {
community?: Community
@@ -150,7 +83,17 @@
read?: boolean
edited?: string
view?: View
badges?: Record<BadgeType, boolean>
// Badges
badges?: {
nsfw: boolean
saved: boolean
featured: boolean
deleted: boolean
removed: boolean
locked: boolean
moderator: boolean
admin: boolean
}
tags?: Tag[]
style?: string
titleClass?: string
@@ -253,7 +196,10 @@
/>
{/if}
<div
class="flex flex-row gap-1.5 items-center no-list-margin"
class="flex flex-row gap-1.5 items-center
no-list-margin {view == 'compact' && showCommunity
? 'min-[480px]:mx-2'
: ''}"
style="grid-area: stats;"
>
{#if user}
@@ -263,7 +209,7 @@
src={PaperAirplane}
size="12"
micro
class="rotate-180 text-slate-400 dark:text-zinc-600 max-[480px]:hidden ml-2"
class="rotate-180 text-slate-400 dark:text-zinc-600 max-[480px]:hidden"
/>
{/if}
<UserLink
@@ -323,20 +269,66 @@
</a>
{/each}
{/if}
{#each Object.keys(badges)
// filter by ones that are true
.filter(i => badges[i as BadgeType] == true)
// get from predetermined map
.map(i => badgeToData.get(i as BadgeType))
// remove null
.filter(i => i != undefined) as badge}
<Badge label={badge.label} color={badge.color} allowIconOnly>
{#if badges.nsfw}
<Badge label={$t('post.badges.nsfw')} color="red-subtle" allowIconOnly>
{#snippet icon()}
<Icon src={badge.icon} micro size="14" />
<Icon src={ExclamationTriangle} size="14" micro />
{/snippet}
{badge.label}
{$t('post.badges.nsfw')}
</Badge>
{/each}
{/if}
{#if badges.saved}
<Badge
label={$t('post.badges.saved')}
color="yellow-subtle"
allowIconOnly
>
{#snippet icon()}
<Icon src={Bookmark} micro size="14" />
{/snippet}
{$t('post.badges.saved')}
</Badge>
{/if}
{#if badges.locked}
<Badge
label={$t('post.badges.locked')}
color="yellow-subtle"
allowIconOnly
>
{#snippet icon()}
<Icon src={LockClosed} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.locked')}</span>
</Badge>
{/if}
{#if badges.removed}
<Badge label={$t('post.badges.removed')} color="red-subtle" allowIconOnly>
{#snippet icon()}
<Icon src={Trash} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.removed')}</span>
</Badge>
{/if}
{#if badges.deleted}
<Badge label={$t('post.badges.deleted')} color="red-subtle" allowIconOnly>
{#snippet icon()}
<Icon src={Trash} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.deleted')}</span>
</Badge>
{/if}
{#if badges.featured}
<Badge
label={$t('post.badges.featured')}
color="green-subtle"
allowIconOnly
>
{#snippet icon()}
<Icon src={Megaphone} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.featured')}</span>
</Badge>
{/if}
{@render extraBadges?.()}
</div>
</header>
@@ -50,6 +50,7 @@
let hasMore = $state(true)
async function loadMore() {
console.log(hasMore, loading)
if (!hasMore || loading) return
try {
@@ -182,10 +183,10 @@
{#snippet item(row)}
<li
data-index={row}
style={row < 9 ? `--anim-delay: ${row * 50}ms` : ''}
style={row < 7 ? `--anim-delay: ${row * 50}ms` : ''}
class={[
'relative post-container px-3 sm:px-6',
row < 9 && 'pop-in opacity-0',
row < 7 && 'pop-in opacity-0',
]}
>
<Post
@@ -218,7 +219,12 @@
<Icon src={ExclamationTriangle} size="24" solid></Icon>
</div>
<pre class="py-0.5">{error}</pre>
<Button color="primary" {loading} onclick={loadMore}>
<Button
color="primary"
{loading}
disabled={loading}
onclick={() => loadMore()}
>
{$t('message.retry')}
</Button>
</div>
@@ -250,7 +256,14 @@
</EndPlaceholder>
</div>
{/if}
<InfiniteScroll window threshold={600} on:loadMore={loadMore} />
<InfiniteScroll
window
threshold={600}
on:loadMore={() => {
console.log('loadMore triggered')
loadMore()
}}
/>
{/if}
{@render children?.()}
</ul>
@@ -269,6 +282,6 @@
.pop-in {
animation: popIn 0.5s cubic-bezier(0.165, 0.84, 0.44, 1) forwards
var(--anim-delay, 0ms);
var(--anim-delay);
}
</style>
@@ -1,6 +1,5 @@
import { settings } from '$lib/settings.svelte'
import type { PostView } from 'lemmy-js-client'
import { SvelteMap, SvelteSet } from 'svelte/reactivity'
export type PostViewWithCrossposts = PostView & {
withCrossposts: true
@@ -11,12 +10,12 @@ export type PostViewWithoutCrossposts = PostView & { withCrossposts?: false }
export const combineCrossposts = (
posts: PostView[],
): (PostViewWithCrossposts | PostViewWithoutCrossposts)[] => {
const urlMap = new SvelteMap<
const urlMap = new Map<
string,
PostViewWithCrossposts | PostViewWithoutCrossposts
>()
const results: (PostViewWithCrossposts | PostViewWithoutCrossposts)[] = []
const seenUrls = new SvelteSet<string>()
const seenUrls = new Set<string>()
posts?.forEach(post => {
if (
@@ -24,7 +24,7 @@
<svelte:element
this={settings.expandImages ? 'button' : 'a'}
href={postLink(post)}
class="container mx-auto z-10 rounded-xl max-h-[60vh] relative overflow-hidden bg-slate-100 dark:bg-zinc-900 cursor-pointer"
class="container mx-auto z-10 rounded-xl max-h-[60vh] relative overflow-hidden bg-slate-100 dark:bg-zinc-900"
data-sveltekit-preload-data="off"
aria-label={post.name}
onclick={() => showImage(bestImageURL(post, false, -1, null))}
+3 -4
View File
@@ -38,10 +38,9 @@
src={open ? Minus : Plus}
size="16"
micro
class={[
open && 'rotate-180',
'transition-transform duration-300 ease-out',
]}
class="{open
? ''
: 'rotate-90'} transition-transform duration-300 ease-out"
/>
{/if}
<div
+2 -3
View File
@@ -6,7 +6,6 @@
import { fly } from 'svelte/transition'
import { page as pageData } from '$app/state'
import { invalidate } from '$app/navigation'
import { SvelteURLSearchParams } from 'svelte/reactivity'
interface Props {
page?: number
@@ -28,8 +27,8 @@
let customHref = (href?: string) => {
if (href?.startsWith('?')) {
const current = new SvelteURLSearchParams(pageData.url.searchParams)
const newParams = new SvelteURLSearchParams(href)
const current = new URLSearchParams(pageData.url.searchParams)
const newParams = new URLSearchParams(href)
current.delete(Array.from(newParams.keys())[0])
current.append(
@@ -1,48 +0,0 @@
<script lang="ts">
let progress = $state(0)
let increaseInterval: number = -1
let startTimeout: number = -1
let stopTimeout: number = -1
export function start() {
clearTimeout(stopTimeout)
progress = 0
startTimeout = setTimeout(() => {
progress = 1
// schedule a setInterval and run the code immediately
;(function i() {
if (progress < 100 && progress > 0)
// slowly get closer and closer to 90% -- 100% doesnt look very good to be stuck on
progress += (100 - (progress - 10)) / 4
increaseInterval = setInterval(i, 400) as unknown as number
})()
}, 100) as unknown as number
}
export function stop() {
if (progress != 0) progress = 100
// reset progress to 0 after bar disappears
setTimeout(() => (progress = 0), 500)
clearInterval(increaseInterval)
clearTimeout(startTimeout)
}
</script>
<div
class={[
'fixed top-0 left-0 h-px z-[400] bg-primary-900 dark:bg-primary-100',
progress == 100 && 'opacity-0',
progress > 0 && 'use-transition',
]}
style="width: {progress}%;"
id="progress-bar"
></div>
<style>
#progress-bar.use-transition {
transition:
width 0.7s cubic-bezier(0, 0, 0.22, 0.76),
opacity 0.5s linear;
}
</style>
+1 -1
View File
@@ -97,7 +97,7 @@
}
}
@media (min-width: 80rem) {
@media (min-width: 1280px) {
.content {
grid-template-columns: 20% 60% 20%;
justify-items: end center start;
@@ -45,7 +45,6 @@ import {
ViewColumns,
type IconSource,
} from 'svelte-hero-icons'
import { SvelteURL } from 'svelte/reactivity'
export interface Group {
name: string
@@ -412,7 +411,7 @@ export function getGroups(
f.community.name,
f.community.actor_id,
)}`,
detail: new SvelteURL(f.community.actor_id).hostname,
detail: new URL(f.community.actor_id).hostname,
})) ?? [],
},
]
@@ -18,7 +18,9 @@
</script>
<SidebarButton
alignment="left"
loading={switching}
rounding="lg"
loaderWidth={22}
selected={profile.current?.id == prof.id}
onclick={async () => {
@@ -45,10 +47,9 @@
/>
{/snippet}
<span
class={[
'inline-flex flex-col gap-0',
profile.current?.id == prof.id && 'font-semibold',
]}
class="inline-flex flex-col gap-0 {profile.current?.id == prof.id
? 'font-semibold'
: ''}"
>
{prof.username ?? prof.user?.local_user_view.person.name}
{#if !guest && !LINKED_INSTANCE_URL}
+21 -15
View File
@@ -34,25 +34,29 @@
{#if profile.current?.jwt}
<SidebarButton icon={UserCircle} href="/profile">
{#snippet label()}
{$t('profile.profile')}
<span>
{$t('profile.profile')}
</span>
{/snippet}
</SidebarButton>
<SidebarButton icon={Inbox} href="/inbox">
{#snippet label()}
{$t('profile.inbox')}
{#if $notifications.inbox}
<Badge
class="min-w-5 h-5 p-0! px-0.5 grid place-items-center ml-auto"
color="red-subtle"
>
{$notifications.inbox > 99 ? '∞' : $notifications.inbox}
</Badge>
{/if}
<span class="flex items-center gap-2">
{$t('profile.inbox')}
{#if $notifications.inbox}
<Badge
class="min-w-5 h-5 p-0! px-0.5 grid place-items-center ml-auto"
color="red-subtle"
>
{$notifications.inbox > 99 ? '∞' : $notifications.inbox}
</Badge>
{/if}
</span>
{/snippet}
</SidebarButton>
<SidebarButton icon={Bookmark} href="/saved">
{#snippet label()}
{$t('profile.saved')}
<span>{$t('profile.saved')}</span>
{/snippet}
</SidebarButton>
{:else}
@@ -62,7 +66,7 @@
icon={ArrowLeftOnRectangle}
>
{#snippet label()}
{$t('account.login')}
<span>{$t('account.login')}</span>
{/snippet}
</SidebarButton>
<SidebarButton
@@ -71,7 +75,7 @@
icon={Identification}
>
{#snippet label()}
{$t('account.signup')}
<span>{$t('account.signup')}</span>
{/snippet}
</SidebarButton>
<SidebarButton
@@ -80,7 +84,7 @@
icon={Cog6Tooth}
>
{#snippet label()}
{$t('nav.menu.settings')}
<span>{$t('nav.menu.settings')}</span>
{/snippet}
</SidebarButton>
{/if}
@@ -105,7 +109,9 @@
{/snippet}
<div class="w-full flex gap-px flex-col">
{#each [...profile.meta.profiles] as prof, index}
<ProfileButton {index} {prof} />
<div class="w-full">
<ProfileButton {index} {prof} />
</div>
{/each}
</div>
<SidebarButton href="/accounts" icon={UserGroup}>
+13 -7
View File
@@ -1,5 +1,11 @@
<script lang="ts">
const badgeColor = {
red: 'bg-red-500 text-white ring-transparent',
green: 'bg-green-500 text-white dark:text-black ring-transparent',
yellow: 'bg-yellow-500 text-black ring-transparent',
gray: 'bg-gray-600 text-white ring-transparent',
blue: 'bg-blue-500 text-white ring-transparent',
purple: 'bg-purple-500 text-white ring-transparent',
'red-subtle': `bg-red-100 dark:bg-red-500/20 text-red-600 dark:text-red-400
ring-red-400 dark:ring-red-500/30`,
'green-subtle': `bg-green-100 dark:bg-green-500/20 text-green-700 dark:text-green-400
@@ -48,13 +54,13 @@
<span
{...rest}
class={[
badgeRoundness[rounding],
badgeColor[color],
'px-2.5 py-1 text-xs font-medium flex items-center gap-1 ring-1 ring-inset',
allowIconOnly && 'max-md:px-1.5 max-md:py-1.5',
clazz,
]}
class="{allowIconOnly
? 'max-md:px-1.5 max-md:py-1.5'
: ''} px-2.5 py-1 {badgeRoundness[
rounding
]} text-xs font-medium flex items-center gap-1 ring-1 ring-inset {badgeColor[
color
]} {clazz}"
title={label}
>
{@render icon?.()}
+3 -3
View File
@@ -123,14 +123,14 @@
role={href ? 'link' : 'button'}
{href}
{...rest}
tabindex={disabled || loading ? -1 : undefined}
tabindex={disabled ? -1 : undefined}
class={[
buttonColor[color],
loading ? buttonColor.secondary : buttonColor[color],
buttonSize[size],
buttonRounding[rounding],
buttonShadow[shadow],
'text-sm transition-all font-medium cursor-pointer duration-75 disabled:opacity-50 disabled:pointer-events-none disabled:shadow-none',
disabled || (loading && 'pointer-events-none opacity-50 shadow-none'),
disabled && 'pointer-events-none opacity-50 shadow-none',
alignment == 'center'
? 'origin-center'
: alignment == 'left'
+59
View File
@@ -0,0 +1,59 @@
<script lang="ts">
import { Button } from '../index.js'
import { Check, Icon, Clipboard } from 'svelte-hero-icons'
import { scale } from 'svelte/transition'
let copied = $state(false)
interface Props {
/**
* Show a copy button.
*/
value: string
copy?: boolean
class?: string
}
let { value, copy = true, class: clazz = '' }: Props = $props()
</script>
<div
class="px-4 py-1 flex justify-between max-w-full box-border bg-slate-100 dark:bg-zinc-950 items-center gap-4 rounded-md border dark:border-zinc-800
{clazz}"
>
<pre class="overflow-auto max-w-full whitespace-nowrap w-max">
{value}
</pre>
{#if copy}
<Button
size="square-md"
color="tertiary"
aria-label="Copy"
onclick={() => {
copied = true
navigator.clipboard.writeText(value)
setTimeout(() => (copied = false), 2000)
}}
>
<div class="relative w-full h-full grid place-items-center">
{#if !copied}
<div
transition:scale={{ opacity: 0, start: 0.3 }}
class="top-0 left-0"
style="grid-row: 1; grid-column: 1;"
>
<Icon src={Clipboard} size="18" mini />
</div>
{:else}
<div
transition:scale={{ opacity: 0, start: 0.3 }}
class="top-0 left-0"
style="grid-row: 1; grid-column: 1;"
>
<Icon src={Check} size="18" mini />
</div>
{/if}
</div>
</Button>
{/if}
</div>
+58
View File
@@ -0,0 +1,58 @@
<script lang="ts">
import { createBubbler } from 'svelte/legacy'
const bubble = createBubbler()
import { generateID } from '../forms/helper.js'
type T = $$Generic
interface Props {
value: T
group: T
inlineDescription?: boolean
id?: string
disabled?: boolean
children?: import('svelte').Snippet
description?: import('svelte').Snippet
}
let {
value,
group = $bindable(),
inlineDescription = false,
id = generateID(),
disabled = false,
children,
description,
...rest
}: Props = $props()
</script>
<div
class="font-normal cursor-pointer text-sm flex flex-row items-baseline gap-2"
>
<input
{...rest}
{id}
type="radio"
bind:group
{value}
onblur={bubble('blur-sm')}
onchange={bubble('change')}
{disabled}
class="cursor-pointer disabled:cursor-not-allowed peer disabled:opacity-50"
/>
<label
for={id}
class="inline-flex {inlineDescription
? 'flex-row'
: 'flex-col'} cursor-pointer peer-disabled:cursor-not-allowed font-medium gap-1 peer-disabled:opacity-50"
>
{@render children?.()}
{#if description}
<span class="font-normal text-slate-600 dark:text-zinc-400">
{@render description?.()}
</span>
{/if}
</label>
</div>
+25
View File
@@ -0,0 +1,25 @@
<script lang="ts">
import { generateID } from '../forms/helper.js'
interface Props {
group?: string
row?: boolean
class?: string
children?: import('svelte').Snippet<[{ group: string }]>
}
let {
group = generateID(),
row = false,
class: clazz = '',
children,
}: Props = $props()
</script>
<div class="flex flex-col gap-1">
<div
class="flex {row ? 'flex-row flex-wrap' : 'flex-col'} gap-4 {clazz || ''}"
>
{@render children?.({ group })}
</div>
</div>
+4
View File
@@ -3,6 +3,7 @@
export { default as Button } from './button/Button.svelte'
export { buttonColor, buttonSize, buttonShadow } from './button/Button.svelte'
export { default as Codeblock } from './code/Codeblock.svelte'
export { default as Snippet } from './code/Snippet.svelte'
export { default as Spinner } from './loader/Spinner.svelte'
export { default as Material } from './materials/Material.svelte'
@@ -17,6 +18,9 @@ export { default as ImageInput } from './forms/ImageInput.svelte'
export { default as Checkbox } from './forms/Checkbox.svelte'
export { default as Switch } from './forms/Switch.svelte'
export { default as Radio } from './forms/Radio.svelte'
export { default as RadioGroup } from './forms/RadioGroup.svelte'
export { default as Popover } from './popover/Popover.svelte'
export { default as Menu } from './popover/Menu.svelte'
export { default as MenuDivider } from './popover/MenuDivider.svelte'
+20 -8
View File
@@ -1,3 +1,16 @@
<script module lang="ts">
export type Origin = keyof typeof popoverOrigins
export const popoverOrigins = {
'top-right': 'bottom-full right-0 origin-bottom-right',
'bottom-left': 'top-full origin-top-left',
'top-left': 'bottom-full left-0 origin-bottom-left',
'bottom-right': 'top-full right-0 origin-top-right',
'top-center': 'bottom-full -left-[450%] origin-bottom',
'bottom-center': 'top-full -left-[450%] origin-top',
}
</script>
<script lang="ts">
import {
flip,
@@ -55,7 +68,11 @@
middleware: middleware,
})
const customFloatingContent = (node: HTMLDivElement) => floatingContent(node)
const customFloatingContent = (node: HTMLDivElement) => {
// if (!canUseContents) return
floatingContent(node)
}
const customFloatingRef = (node: HTMLDivElement) => {
const n = node.children.item(0)
@@ -67,13 +84,6 @@
floatingRef(node)
}
}
// let previousFocus = $state<Element>()
// function focusTrap(element: HTMLElement) {
// previousFocus = document.activeElement ?? previousFocus
// svelteFocusTrap(element)
// }
</script>
<svelte:body
@@ -95,6 +105,8 @@
onkeydown={async e => {
if (open && e.key == 'Escape') {
open = false
// @ts-expect-error svelte hell
el?.firstChild.focus()
}
}}
/>
+27 -4
View File
@@ -7,7 +7,6 @@ import { toast } from 'mono-svelte'
import { t } from './i18n/translations'
import { site } from './lemmy.svelte'
import { errorMessage } from './lemmy/error'
import { SvelteURL } from 'svelte/reactivity'
// Despite the name, this will round up
// Example: findClosestNumber([8, 16, 32, 64, 128], 76) will return 128
@@ -30,7 +29,7 @@ export const searchParam = (
}
export const fullCommunityName = (name: string, actorId: string) =>
`${name}@${new SvelteURL(actorId).hostname}`
`${name}@${new URL(actorId).hostname}`
export const placeholders = {
url: ['https://example.com'],
@@ -134,6 +133,30 @@ export async function uploadImage(
if (res.url) return res.url
else throw new Error(`Failed to upload image. ${res.msg}`)
} else {
const response = await fetch(
`${
window.location.origin
}/cors/${instance}/pictrs/image?${new URLSearchParams({
auth: jwt,
})}`,
{
method: 'POST',
body: formData,
},
)
const json = await response.json()
if (json.msg == 'ok') {
return `https://${instance}/pictrs/image/${json.files?.[0]?.file}`
}
throw new Error(
`${
(await response.text().catch(() => undefined)) ??
'Failed to upload image'
}: ${response.status}: ${response.statusText}`,
)
}
}
@@ -144,7 +167,7 @@ export const instanceToURL = (input: string) =>
export function canParseUrl(url: string): boolean {
try {
new SvelteURL(url)
new URL(url)
return true
} catch {
return false
@@ -152,7 +175,7 @@ export function canParseUrl(url: string): boolean {
}
export function instanceId(actorId: string) {
return new SvelteURL(actorId).hostname
return new URL(actorId).hostname
}
export function escapeHtml(input: string): string {
+22 -18
View File
@@ -2,6 +2,7 @@
import { browser } from '$app/environment'
import { navigating, page } from '$app/state'
import Moderation from '$lib/components/lemmy/moderation/Moderation.svelte'
import SiteCard from '$lib/components/lemmy/SiteCard.svelte'
import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte'
import Shell from '$lib/components/ui/layout/Shell.svelte'
import Navbar from '$lib/components/ui/navbar/Navbar.svelte'
@@ -13,17 +14,25 @@
import { inDarkColorScheme, rgbToHex, theme } from '$lib/ui/colors.svelte.js'
import { getDefaultColors } from '$lib/ui/presets'
import { Button, ModalContainer, Spinner, ToastContainer } from 'mono-svelte'
import nProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { onMount } from 'svelte'
import { Forward, Icon } from 'svelte-hero-icons'
import '../style/app.css'
import NavigationProgress from '$lib/components/ui/layout/NavigationProgress.svelte'
interface Props {
children?: import('svelte').Snippet
}
let { children }: Props = $props()
let progressBar = $state<{ start: () => void; stop: () => void }>()
nProgress.configure({
minimum: 0.4,
trickleSpeed: 200,
easing: 'ease-out',
speed: 300,
showSpinner: false,
})
onMount(() => {
if (browser) {
if (window.location.hash == 'main') {
@@ -63,12 +72,12 @@
document.documentElement.dir =
($locale == 'he' || $locale == 'ar') && settings.useRtl ? 'rtl' : 'ltr'
})
$effect(() => {
if (navigating.to) progressBar?.start()
else progressBar?.stop()
})
}
$effect(() => {
if (navigating.to) nProgress.start()
else nProgress.done()
})
</script>
<svelte:head>
@@ -96,7 +105,6 @@
<Button
class="fixed -top-16 focus:top-0 left-0 m-4 z-300 transition-all"
href="#main"
onclick={() => document.getElementById('main')?.focus()}
>
{#snippet prefix()}
<Icon src={Forward} mini size="16" />
@@ -104,8 +112,6 @@
Skip Navigation
</Button>
<NavigationProgress bind:this={progressBar} />
<Shell>
<Moderation />
<ToastContainer />
@@ -133,14 +139,12 @@
{@const SvelteComponent = page.data.slots.sidebar.component}
<SvelteComponent {...page.data.slots.sidebar.props} class="pt-0!" />
{:else if site.data}
{#await import('$lib/components/lemmy/SiteCard.svelte') then { default: SiteCard }}
<SiteCard
site={site.data.site_view}
taglines={site.data.taglines}
admins={site.data.admins}
version={site.data.version}
/>
{/await}
<SiteCard
site={site.data.site_view}
taglines={site.data.taglines}
admins={site.data.admins}
version={site.data.version}
/>
{:else}
<div class="h-64 w-full grid place-items-center">
<Spinner width={32} />
+3 -4
View File
@@ -12,7 +12,6 @@
import { Button } from 'mono-svelte'
import { ArrowPath, Check, Icon, Inbox } from 'svelte-hero-icons'
import InboxItem from './InboxItem.svelte'
import { SvelteURLSearchParams } from 'svelte/reactivity'
let { data } = $props()
@@ -43,11 +42,11 @@
currentSearchParams: URLSearchParams,
newParamString: string,
) {
// Create a new SvelteURLSearchParams object from the current search params
const updatedParams = new SvelteURLSearchParams(currentSearchParams)
// Create a new URLSearchParams object from the current search params
const updatedParams = new URLSearchParams(currentSearchParams)
// Parse the new parameter string
const newParam = new SvelteURLSearchParams(newParamString)
const newParam = new URLSearchParams(newParamString)
// Get the key and value of the new parameter
const [key, value]: [string, string] = newParam.entries().next().value!
+1 -2
View File
@@ -16,7 +16,6 @@
import { Button, Modal } from 'mono-svelte'
import { ChatBubbleOvalLeftEllipsis, Icon, Inbox } from 'svelte-hero-icons'
import { expoOut } from 'svelte/easing'
import { SvelteSet } from 'svelte/reactivity'
import { fly } from 'svelte/transition'
interface ConversationPreview {
@@ -35,7 +34,7 @@
}
function filterDuplicates<T, K>(array: T[], predicate: (item: T) => K): T[] {
const seen = new SvelteSet()
const seen = new Set()
return array.filter(element => {
const value = predicate(element)
if (seen.has(value)) {
+48
View File
@@ -0,0 +1,48 @@
<script lang="ts">
import { profile } from '$lib/auth.svelte'
import Portal from 'mono-svelte/popover/Portal.svelte'
import { onDestroy, onMount } from 'svelte'
let audio = $state<HTMLAudioElement>()
onMount(() => {
audio?.play()
document.body.style.rotate = `5deg`
document.body.style.transition = 'rotate 1s linear'
})
onDestroy(() => {
document.body.style.rotate = ''
})
</script>
<audio bind:this={audio}>
<source src="/other/mc.mp3" type="audio/mpeg" />
</audio>
<Portal class="z-50 fixed inset-0">
<div
class="inset-0 bg-red-500/20 w-screen h-screen flex flex-col gap-4 items-center p-16 z-50"
style="rotate: -5deg; transition: rotate 1s linear;"
>
<div class="bg-black/20 font-mono fixed left-1/2 -translate-x-1/2">
<p>{profile.current.username ?? 'You'} was slain by Command Palette</p>
</div>
<img
src="/other/mc.png"
class="object-contain w-full h-full"
alt="Minecraft 'you died'"
/>
</div>
</Portal>
<style>
@font-face {
font-family: 'mc';
src: url('/other/mc.otf') format('opentype');
}
.main {
font-family: 'mc';
}
</style>
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB