feat(timeline): wire the grouping toggle into the Zeitstrahl page
Add the grouping $state beside the #780 layer-filter state, render the GroupingControl stacked above the filter trigger (disabled, but kept in place, when no loose letters remain), make the meta-line grouping label track the active mode, and thread groupingMode into TimelineView — filter-then-group, no refetch. Refs #827 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -2,8 +2,10 @@
|
||||
import * as m from '$lib/paraglide/messages.js';
|
||||
import TimelineView from '$lib/timeline/TimelineView.svelte';
|
||||
import TimelineFilters from '$lib/timeline/TimelineFilters.svelte';
|
||||
import GroupingControl from '$lib/timeline/GroupingControl.svelte';
|
||||
import { timelineMeta } from '$lib/timeline/timelineMeta';
|
||||
import { filterTimeline } from '$lib/timeline/timelineFilter';
|
||||
import { hasLooseLetters, type GroupingMode } from '$lib/timeline/timelineGrouping';
|
||||
import type { PageData } from './$types';
|
||||
|
||||
let { data }: { data: PageData } = $props();
|
||||
@@ -17,12 +19,20 @@ let personalOn = $state(true);
|
||||
let historicalOn = $state(true);
|
||||
let lettersOn = $state(true);
|
||||
|
||||
// Grouping state (#827) lives here beside the layer-filter state; the regroup is a
|
||||
// pure client-side transform over the already-filtered view — filter-then-group.
|
||||
let groupingMode = $state<GroupingMode>('date');
|
||||
|
||||
const filteredTimeline = $derived(
|
||||
filterTimeline(data.timeline, { personalOn, historicalOn, lettersOn })
|
||||
);
|
||||
const filteredEmpty = $derived(
|
||||
filteredTimeline.years.length === 0 && filteredTimeline.undated.length === 0
|
||||
);
|
||||
// The grouping control is only meaningful while loose letters remain in the filtered
|
||||
// view; with the Letters layer off there is nothing to regroup, so it disables but
|
||||
// keeps its selected mode (REQ-018).
|
||||
const hasLetters = $derived(hasLooseLetters(filteredTimeline));
|
||||
|
||||
// Meta-line figures track the *filtered* view, so the header counts always
|
||||
// match what is actually on screen once layers are toggled off (#780 — this
|
||||
@@ -60,7 +70,13 @@ const metaLine = $derived.by(() => {
|
||||
: m.timeline_events_count({ count: meta.eventCount })
|
||||
);
|
||||
}
|
||||
segments.push(m.timeline_grouping_date());
|
||||
segments.push(
|
||||
groupingMode === 'event'
|
||||
? m.timeline_grouping_event()
|
||||
: groupingMode === 'thema'
|
||||
? m.timeline_grouping_thema()
|
||||
: m.timeline_grouping_date()
|
||||
);
|
||||
return segments.join(' · ');
|
||||
});
|
||||
</script>
|
||||
@@ -89,7 +105,14 @@ const metaLine = $derived.by(() => {
|
||||
{/if}
|
||||
</header>
|
||||
{#if hasContent}
|
||||
<p data-testid="timeline-meta" class="mt-1 mb-6 font-sans text-xs text-ink-3">{metaLine}</p>
|
||||
<p data-testid="timeline-meta" class="mt-1 mb-3 font-sans text-xs text-ink-3">{metaLine}</p>
|
||||
<!-- Grouping toggle stacked above the #780 layer-filter trigger so the two read as
|
||||
one control cluster in the header (REQ-010); the top-right corner stays the
|
||||
add-event CTA. Disabled — but kept in place — when no loose letters remain
|
||||
(REQ-018). -->
|
||||
<div class="mb-3" data-testid="grouping-cluster">
|
||||
<GroupingControl bind:mode={groupingMode} disabled={!hasLetters} />
|
||||
</div>
|
||||
<TimelineFilters
|
||||
bind:personalOn={personalOn}
|
||||
bind:historicalOn={historicalOn}
|
||||
@@ -112,7 +135,11 @@ const metaLine = $derived.by(() => {
|
||||
</button>
|
||||
</div>
|
||||
{:else}
|
||||
<TimelineView timeline={filteredTimeline} canWrite={data.canWrite} />
|
||||
<TimelineView
|
||||
timeline={filteredTimeline}
|
||||
canWrite={data.canWrite}
|
||||
groupingMode={groupingMode}
|
||||
/>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user