diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json index 9f6d2a8c..8b2a3f07 100644 --- a/src/lib/app/i18n/en.json +++ b/src/lib/app/i18n/en.json @@ -547,6 +547,9 @@ "hide": "Hide", "unhide": "Unhide", "share": "Share", + "share.from": "Share from", + "share.global": "Origin server", + "share.local": "Your server", "crosspost": "Crosspost", "delete": "Delete", "restore": "Restore" diff --git a/src/lib/feature/community/CommunityCard.svelte b/src/lib/feature/community/CommunityCard.svelte index 10d8cfcb..91ad8ec9 100644 --- a/src/lib/feature/community/CommunityCard.svelte +++ b/src/lib/feature/community/CommunityCard.svelte @@ -7,8 +7,6 @@ import Markdown from '$lib/app/markdown/Markdown.svelte' import { settings } from '$lib/app/settings.svelte' import { fullCommunityName, userLink } from '$lib/app/util.svelte' - import Avatar from '$lib/ui/generic/Avatar.svelte' - import Entity from '$lib/ui/generic/Entity.svelte' import ItemList from '$lib/ui/generic/ItemList.svelte' import LabelStat from '$lib/ui/info/LabelStat.svelte' import EndPlaceholder from '$lib/ui/layout/EndPlaceholder.svelte' @@ -108,6 +106,8 @@ {#if editing} @@ -116,6 +143,7 @@
+ {#if settings.debugInfo} {#if debug} {#await import('$lib/ui/util/debug/DebugObject.svelte') then { default: DebugObject }} @@ -170,6 +198,30 @@ > {/if} + + {#snippet target(attachment)} + + {#snippet target(popover)} - {/snippet} - share(true)} icon={GlobeAlt}> - {$t('filter.location.global')} - - share(false)} icon={MapPin}> - {$t('filter.location.local')} - - - {/if} - {#if profile.current?.jwt} { diff --git a/src/lib/ui/generic/EntityHeader.svelte b/src/lib/ui/generic/EntityHeader.svelte index fa250087..d39ea03f 100644 --- a/src/lib/ui/generic/EntityHeader.svelte +++ b/src/lib/ui/generic/EntityHeader.svelte @@ -3,6 +3,7 @@ import { Material } from 'mono-svelte' import type { ClassValue } from 'svelte/elements' import LabelStat from '../info/LabelStat.svelte' + import TextProps from '../text/TextProps.svelte' import Avatar from './Avatar.svelte' import Blobs from './Blobs.svelte' @@ -14,7 +15,7 @@ url?: string | undefined stats?: { name: string - value: string + value: string | number format?: boolean }[] class?: ClassValue @@ -42,55 +43,69 @@ }: Props = $props() -
- +
+
{#if banner} User banner {:else} -
+
{/if}
- + {#snippet icon(width: number)} + + {/snippet} + +
+ {@render icon(48)} +
+ +
{name} -

- {@render nameDetail?.()} -

+ {#if nameDetail} +

+ + {@render nameDetail?.()} + +

+ {/if}
- {#if actions || stats} + {#if actions || stats.length > 0}
{#if actions} diff --git a/src/lib/ui/shared/popover/Popover.svelte b/src/lib/ui/shared/popover/Popover.svelte index 3c15b8f3..3b6b1b6f 100644 --- a/src/lib/ui/shared/popover/Popover.svelte +++ b/src/lib/ui/shared/popover/Popover.svelte @@ -84,7 +84,8 @@ open = newOpen } - const mouseLeave = () => openOnHover && toggle(false) + const mouseover = () => openOnHover && toggle(true) + const mouseleave = () => openOnHover && toggle(false) const focus = () => openOnHover && toggle(true) const focusout = () => openOnHover && toggle(false) const click = () => { @@ -112,7 +113,8 @@ } } - e.addEventListener('mouseleave', mouseLeave) + e.addEventListener('mouseover', mouseover) + e.addEventListener('mouseleave', mouseleave) e.addEventListener('focus', focus) e.addEventListener('focusout', focusout) e.addEventListener('click', click) @@ -121,7 +123,8 @@ floatingRef(e) return () => { - e.removeEventListener('mouseleave', mouseLeave) + e.addEventListener('mouseover', mouseover) + e.removeEventListener('mouseleave', mouseleave) e.removeEventListener('focus', focus) e.removeEventListener('focusout', focusout) e.removeEventListener('click', click) @@ -149,7 +152,13 @@ {#if popover} {@render popover(open)} {:else} - + {@render children?.(open)} {/if}