fix(frontend): restore outside-click dismiss, collapse story groups by default
This commit is contained in:
@@ -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,6 +178,12 @@
|
|||||||
{#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">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="group-toggle"
|
||||||
|
aria-expanded={Boolean(expanded[group.peerId])}
|
||||||
|
onclick={() => toggle(group.peerId)}
|
||||||
|
>
|
||||||
<Avatar
|
<Avatar
|
||||||
name={group.name}
|
name={group.name}
|
||||||
colorKey={group.peerId}
|
colorKey={group.peerId}
|
||||||
@@ -177,6 +193,10 @@
|
|||||||
/>
|
/>
|
||||||
<span class="group-name">{group.name}</span>
|
<span class="group-name">{group.name}</span>
|
||||||
<span class="group-count">{group.stories.length}</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,6 +208,7 @@
|
|||||||
<Icon name="cloud-download" />
|
<Icon name="cloud-download" />
|
||||||
</Button>
|
</Button>
|
||||||
</header>
|
</header>
|
||||||
|
{#if expanded[group.peerId]}
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
{#each group.stories as item, index (item.story_id)}
|
{#each group.stories as item, index (item.story_id)}
|
||||||
<button
|
<button
|
||||||
@@ -220,6 +241,7 @@
|
|||||||
</button>
|
</button>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
|
{/if}
|
||||||
</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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user