fix(frontend): restore outside-click dismiss, collapse story groups by default

This commit is contained in:
hh
2026-08-06 15:28:10 +02:00
parent 004fd56f2c
commit 683b9a31a3
2 changed files with 97 additions and 43 deletions
@@ -32,6 +32,7 @@
let groups = $state<Group[]>([]); let groups = $state<Group[]>([]);
let loading = $state(false); let loading = $state(false);
const previews = $state<Record<number, string | null>>({}); const previews = $state<Record<number, string | null>>({});
const expanded = $state<Record<number, boolean>>({});
let token = 0; let token = 0;
let viewerOpen = $state(false); let viewerOpen = $state(false);
@@ -110,12 +111,17 @@
for (const key of Object.keys(previews)) { for (const key of Object.keys(previews)) {
delete previews[Number(key)]; delete previews[Number(key)];
} }
for (const key of Object.keys(expanded)) {
delete expanded[Number(key)];
}
load().catch(() => undefined); load().catch(() => undefined);
}); });
}); });
$effect(() => { $effect(() => {
const list = groups.flatMap((group) => group.stories); const list = groups
.filter((group) => expanded[group.peerId])
.flatMap((group) => group.stories);
let active = true; let active = true;
untrack(() => { untrack(() => {
for (const item of list) { for (const item of list) {
@@ -156,6 +162,10 @@
viewerIndex = index; viewerIndex = index;
viewerOpen = true; viewerOpen = true;
} }
function toggle(peerId: number) {
expanded[peerId] = !expanded[peerId];
}
</script> </script>
{#if groups.length === 0} {#if groups.length === 0}
@@ -168,15 +178,25 @@
{#each groups as group (group.peerId)} {#each groups as group (group.peerId)}
<section class="group"> <section class="group">
<header class="group-head"> <header class="group-head">
<Avatar <button
name={group.name} type="button"
colorKey={group.peerId} class="group-toggle"
size={2} aria-expanded={Boolean(expanded[group.peerId])}
avatar={{ kind: group.kind, id: group.peerId }} onclick={() => toggle(group.peerId)}
hasAvatar={group.hasAvatar} >
/> <Avatar
<span class="group-name">{group.name}</span> name={group.name}
<span class="group-count">{group.stories.length}</span> colorKey={group.peerId}
size={2}
avatar={{ kind: group.kind, id: group.peerId }}
hasAvatar={group.hasAvatar}
/>
<span class="group-name">{group.name}</span>
<span class="group-count">{group.stories.length}</span>
<span class="chevron" class:open={expanded[group.peerId]}>
<Icon name="down" size="1.25rem" />
</span>
</button>
<Button <Button
variant="translucent" variant="translucent"
round round
@@ -188,38 +208,40 @@
<Icon name="cloud-download" /> <Icon name="cloud-download" />
</Button> </Button>
</header> </header>
<div class="grid"> {#if expanded[group.peerId]}
{#each group.stories as item, index (item.story_id)} <div class="grid">
<button {#each group.stories as item, index (item.story_id)}
type="button" <button
class="tile" type="button"
class:expired={item.deleted} class="tile"
onclick={() => openViewer(group, index)} class:expired={item.deleted}
> onclick={() => openViewer(group, index)}
{#if previews[item.story_id]} >
{#if item.media_kind === "video"} {#if previews[item.story_id]}
<video {#if item.media_kind === "video"}
src={previews[item.story_id]} <video
muted src={previews[item.story_id]}
playsinline muted
preload="metadata" playsinline
use:poster preload="metadata"
></video> use:poster
<span class="play"><Icon name="play" size="1.5rem" /></span> ></video>
<span class="play"><Icon name="play" size="1.5rem" /></span>
{:else}
<img src={previews[item.story_id]} alt="">
{/if}
{:else} {:else}
<img src={previews[item.story_id]} alt=""> <span class="ph"><Icon name="play-story" /></span>
{/if} {/if}
{:else} {#if item.views}
<span class="ph"><Icon name="play-story" /></span> <span class="badge views">
{/if} <Icon name="eye" size="0.875rem" />{item.views}
{#if item.views} </span>
<span class="badge views"> {/if}
<Icon name="eye" size="0.875rem" />{item.views} </button>
</span> {/each}
{/if} </div>
</button> {/if}
{/each}
</div>
</section> </section>
{/each} {/each}
@@ -249,6 +271,31 @@
padding: 0.625rem 0.75rem; padding: 0.625rem 0.75rem;
} }
.group-toggle {
display: flex;
flex: 1;
align-items: center;
gap: 0.625rem;
min-width: 0;
padding: 0;
border: 0;
text-align: left;
cursor: pointer;
background: transparent;
}
.chevron {
display: flex;
color: var(--color-text-secondary);
transition: transform 0.2s ease;
&.open {
transform: rotate(180deg);
}
}
.group-name { .group-name {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
@@ -1,3 +1,9 @@
<script lang="ts" module>
type PointerHandler = (event: PointerEvent) => void;
const claimed = new WeakSet<Event>();
</script>
<script lang="ts"> <script lang="ts">
import { ContextMenu } from "bits-ui"; import { ContextMenu } from "bits-ui";
import type { Snippet } from "svelte"; import type { Snippet } from "svelte";
@@ -9,8 +15,6 @@
const { children, menu }: Props = $props(); const { children, menu }: Props = $props();
type PointerHandler = (event: PointerEvent) => void;
let open = $state(false); let open = $state(false);
let suppressClick = false; let suppressClick = false;
@@ -21,7 +25,10 @@
...props, ...props,
onpointerdown(event: PointerEvent) { onpointerdown(event: PointerEvent) {
suppressClick = false; suppressClick = false;
event.stopPropagation(); if (claimed.has(event)) {
return;
}
claimed.add(event);
onpointerdown(event); onpointerdown(event);
}, },
onpointerup(event: PointerEvent) { onpointerup(event: PointerEvent) {