feat: unified chapter picker overlay + currently reading quick-switch modal on reader
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
zIndex?: string;
|
zIndex?: string;
|
||||||
/** Called when a chapter row is tapped. The overlay does NOT close itself. */
|
/** Called when a chapter row is tapped. The overlay does NOT close itself. */
|
||||||
onselect: (chapterNumber: number) => void;
|
onselect: (chapterNumber: number) => void;
|
||||||
/** Called when the close / chevron-down button is tapped. */
|
/** Called when the close (✕) button is tapped. */
|
||||||
onclose: () => void;
|
onclose: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,12 +40,6 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
/** Scroll the active chapter into view instantly (no animation) when the
|
|
||||||
* list is first rendered so the user never has to hunt for their position. */
|
|
||||||
function scrollIfActive(node: HTMLElement, isActive: boolean) {
|
|
||||||
if (isActive) node.scrollIntoView({ block: 'center', behavior: 'instant' });
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleClose() {
|
function handleClose() {
|
||||||
search = '';
|
search = '';
|
||||||
onclose();
|
onclose();
|
||||||
@@ -73,9 +67,9 @@
|
|||||||
class="p-2 rounded-full text-(--color-muted) hover:text-(--color-text) hover:bg-(--color-surface-2) transition-colors"
|
class="p-2 rounded-full text-(--color-muted) hover:text-(--color-text) hover:bg-(--color-surface-2) transition-colors"
|
||||||
aria-label="Close chapter picker"
|
aria-label="Close chapter picker"
|
||||||
>
|
>
|
||||||
<!-- chevron-down -->
|
<!-- close / ✕ -->
|
||||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider flex-1">Chapters</span>
|
<span class="text-xs font-semibold text-(--color-muted) uppercase tracking-wider flex-1">Chapters</span>
|
||||||
@@ -105,7 +99,6 @@
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onclick={() => handleSelect(ch.number)}
|
onclick={() => handleSelect(ch.number)}
|
||||||
use:scrollIfActive={ch.number === activeChapter}
|
|
||||||
class={cn(
|
class={cn(
|
||||||
'w-full flex items-center gap-3 px-4 py-3 border-b border-(--color-border)/40 transition-colors text-left',
|
'w-full flex items-center gap-3 px-4 py-3 border-b border-(--color-border)/40 transition-colors text-left',
|
||||||
ch.number === activeChapter ? 'bg-(--color-brand)/8' : 'hover:bg-(--color-surface-2)'
|
ch.number === activeChapter ? 'bg-(--color-brand)/8' : 'hover:bg-(--color-surface-2)'
|
||||||
|
|||||||
193
ui/src/lib/components/CurrentlyReadingModal.svelte
Normal file
193
ui/src/lib/components/CurrentlyReadingModal.svelte
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { browser } from '$app/environment';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { cn } from '$lib/utils';
|
||||||
|
|
||||||
|
interface Book {
|
||||||
|
slug: string;
|
||||||
|
title: string;
|
||||||
|
cover?: string;
|
||||||
|
author?: string;
|
||||||
|
genres?: string[] | string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ReadingEntry {
|
||||||
|
book: Book;
|
||||||
|
chapter: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
/** The slug of the book currently being read — highlighted in the list. */
|
||||||
|
currentSlug: string;
|
||||||
|
onclose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
let { currentSlug, onclose }: Props = $props();
|
||||||
|
|
||||||
|
let entries = $state<ReadingEntry[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state('');
|
||||||
|
|
||||||
|
// ── Fetch in-progress books on mount ──────────────────────────────────────
|
||||||
|
$effect(() => {
|
||||||
|
if (!browser) return;
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/home');
|
||||||
|
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||||
|
const data = await res.json() as { continue_reading: ReadingEntry[] };
|
||||||
|
entries = data.continue_reading ?? [];
|
||||||
|
} catch {
|
||||||
|
error = 'Failed to load your reading list.';
|
||||||
|
} finally {
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Body scroll lock ──────────────────────────────────────────────────────
|
||||||
|
$effect(() => {
|
||||||
|
if (!browser) return;
|
||||||
|
const prev = document.body.style.overflow;
|
||||||
|
document.body.style.overflow = 'hidden';
|
||||||
|
return () => { document.body.style.overflow = prev; };
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Keyboard: Escape closes ───────────────────────────────────────────────
|
||||||
|
function onKeydown(e: KeyboardEvent) {
|
||||||
|
if (e.key === 'Escape') onclose();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Navigate to a book's current chapter ─────────────────────────────────
|
||||||
|
function openBook(entry: ReadingEntry) {
|
||||||
|
onclose();
|
||||||
|
goto(`/books/${entry.book.slug}/chapters/${entry.chapter}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseGenres(genres: string[] | string | undefined): string[] {
|
||||||
|
if (!genres) return [];
|
||||||
|
if (Array.isArray(genres)) return genres;
|
||||||
|
try { const p = JSON.parse(genres); return Array.isArray(p) ? p : []; } catch { return []; }
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svelte:window onkeydown={onKeydown} />
|
||||||
|
|
||||||
|
<!-- Backdrop -->
|
||||||
|
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||||
|
<div
|
||||||
|
class="fixed inset-0 z-[70] flex flex-col"
|
||||||
|
style="background: rgba(0,0,0,0.6); backdrop-filter: blur(4px);"
|
||||||
|
onpointerdown={(e) => { if (e.target === e.currentTarget) onclose(); }}
|
||||||
|
>
|
||||||
|
<!-- Panel — matches SearchModal style -->
|
||||||
|
<!-- svelte-ignore a11y_no_static_element_interactions -->
|
||||||
|
<div
|
||||||
|
class="w-full max-w-2xl mx-auto mt-0 sm:mt-16 flex flex-col bg-(--color-surface) sm:rounded-2xl border-b sm:border border-(--color-border) shadow-2xl overflow-hidden"
|
||||||
|
style="max-height: 100svh;"
|
||||||
|
onpointerdown={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
<!-- Header row -->
|
||||||
|
<div class="flex items-center gap-3 px-4 py-3 border-b border-(--color-border) shrink-0">
|
||||||
|
<svg class="w-5 h-5 text-(--color-muted) shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"/>
|
||||||
|
</svg>
|
||||||
|
<span class="flex-1 text-base font-semibold text-(--color-text)">Currently Reading</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onclick={onclose}
|
||||||
|
class="shrink-0 px-3 py-1 rounded-lg text-sm text-(--color-muted) hover:text-(--color-text) hover:bg-(--color-surface-2) transition-colors"
|
||||||
|
aria-label="Close"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Scrollable body -->
|
||||||
|
<div class="flex-1 overflow-y-auto overscroll-contain">
|
||||||
|
|
||||||
|
{#if loading}
|
||||||
|
<!-- Loading skeleton -->
|
||||||
|
<div class="px-4 pt-3 pb-4 space-y-1">
|
||||||
|
{#each [1, 2, 3] as _}
|
||||||
|
<div class="flex items-center gap-3 px-0 py-3 border-b border-(--color-border)/40">
|
||||||
|
<div class="shrink-0 w-10 h-14 rounded bg-(--color-surface-3) animate-pulse"></div>
|
||||||
|
<div class="flex-1 space-y-2">
|
||||||
|
<div class="h-3.5 bg-(--color-surface-3) rounded animate-pulse w-3/4"></div>
|
||||||
|
<div class="h-3 bg-(--color-surface-3) rounded animate-pulse w-1/2"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{:else if error}
|
||||||
|
<p class="px-5 py-8 text-sm text-center text-(--color-danger)">{error}</p>
|
||||||
|
|
||||||
|
{:else if entries.length === 0}
|
||||||
|
<div class="px-5 py-12 text-center">
|
||||||
|
<p class="text-sm font-semibold text-(--color-text) mb-1">No books in progress</p>
|
||||||
|
<p class="text-xs text-(--color-muted)">Books you start reading will appear here.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{:else}
|
||||||
|
{#each entries as entry, i}
|
||||||
|
{@const genres = parseGenres(entry.book.genres)}
|
||||||
|
{@const isCurrent = entry.book.slug === currentSlug}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onclick={() => openBook(entry)}
|
||||||
|
class={cn(
|
||||||
|
'w-full flex items-center gap-3 px-4 py-3 text-left transition-colors border-b border-(--color-border)/40 last:border-0',
|
||||||
|
isCurrent ? 'bg-(--color-brand)/8' : 'hover:bg-(--color-surface-2)'
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<!-- Cover thumbnail -->
|
||||||
|
<div class="shrink-0 w-10 h-14 rounded overflow-hidden bg-(--color-surface-2) border border-(--color-border) relative">
|
||||||
|
{#if entry.book.cover}
|
||||||
|
<img src={entry.book.cover} alt="" class="w-full h-full object-cover" loading="lazy" />
|
||||||
|
{:else}
|
||||||
|
<div class="w-full h-full flex items-center justify-center">
|
||||||
|
<svg class="w-5 h-5 text-(--color-muted)/40" fill="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path d="M18 2H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2z"/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Info -->
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<div class="flex items-start gap-2">
|
||||||
|
<p class={cn(
|
||||||
|
'text-sm font-semibold leading-snug line-clamp-1 flex-1',
|
||||||
|
isCurrent ? 'text-(--color-brand)' : 'text-(--color-text)'
|
||||||
|
)}>
|
||||||
|
{entry.book.title}
|
||||||
|
</p>
|
||||||
|
{#if isCurrent}
|
||||||
|
<span class="shrink-0 text-[10px] font-semibold px-1.5 py-0.5 rounded bg-(--color-brand)/15 text-(--color-brand) border border-(--color-brand)/30 leading-none mt-0.5">
|
||||||
|
Now
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{#if entry.book.author}
|
||||||
|
<p class="text-xs text-(--color-muted) mt-0.5 truncate">{entry.book.author}</p>
|
||||||
|
{/if}
|
||||||
|
<div class="flex items-center gap-1.5 mt-1 flex-wrap">
|
||||||
|
<span class="text-xs text-(--color-muted)/60">Ch. {entry.chapter}</span>
|
||||||
|
{#each genres.slice(0, 2) as g}
|
||||||
|
<span class="text-[10px] px-1.5 py-0.5 rounded-full bg-(--color-surface-3) text-(--color-muted)">{g}</span>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Chevron (dimmed for current, normal for others) -->
|
||||||
|
<svg class={cn('w-4 h-4 shrink-0', isCurrent ? 'text-(--color-brand)/40' : 'text-(--color-muted)/40')} fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
{/each}
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -98,7 +98,6 @@
|
|||||||
// ── Chapter click-to-play ─────────────────────────────────────────────────
|
// ── Chapter click-to-play ─────────────────────────────────────────────────
|
||||||
function playChapter(chapterNumber: number) {
|
function playChapter(chapterNumber: number) {
|
||||||
audioStore.autoStartChapter = chapterNumber;
|
audioStore.autoStartChapter = chapterNumber;
|
||||||
onclose();
|
|
||||||
goto(`/books/${audioStore.slug}/chapters/${chapterNumber}`);
|
goto(`/books/${audioStore.slug}/chapters/${chapterNumber}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,17 +433,6 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<!-- Chapter modal (full-screen overlay) -->
|
|
||||||
{#if showChapterModal && audioStore.chapters.length > 0}
|
|
||||||
<ChapterPickerOverlay
|
|
||||||
chapters={audioStore.chapters}
|
|
||||||
activeChapter={audioStore.chapter}
|
|
||||||
zIndex="z-[80]"
|
|
||||||
onselect={playChapter}
|
|
||||||
onclose={() => { showChapterModal = false; }}
|
|
||||||
/>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<!-- ── Controls area (bottom half) ───────────────────────────────────── -->
|
<!-- ── Controls area (bottom half) ───────────────────────────────────── -->
|
||||||
<div class="flex-1 flex flex-col justify-end px-6 pb-6 gap-0 shrink-0 overflow-hidden" style="z-index: 2; position: relative;">
|
<div class="flex-1 flex flex-col justify-end px-6 pb-6 gap-0 shrink-0 overflow-hidden" style="z-index: 2; position: relative;">
|
||||||
|
|
||||||
@@ -670,3 +658,16 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Chapter picker rendered OUTSIDE the transformed overlay so that
|
||||||
|
fixed inset-0 anchors to the real viewport, not the CSS-transformed
|
||||||
|
containing block (transform: translateY breaks fixed positioning). -->
|
||||||
|
{#if showChapterModal && audioStore.chapters.length > 0}
|
||||||
|
<ChapterPickerOverlay
|
||||||
|
chapters={audioStore.chapters}
|
||||||
|
activeChapter={audioStore.chapter}
|
||||||
|
zIndex="z-[80]"
|
||||||
|
onselect={playChapter}
|
||||||
|
onclose={() => { showChapterModal = false; }}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import AudioPlayer from '$lib/components/AudioPlayer.svelte';
|
import AudioPlayer from '$lib/components/AudioPlayer.svelte';
|
||||||
import CommentsSection from '$lib/components/CommentsSection.svelte';
|
import CommentsSection from '$lib/components/CommentsSection.svelte';
|
||||||
|
import CurrentlyReadingModal from '$lib/components/CurrentlyReadingModal.svelte';
|
||||||
import type { PageData } from './$types';
|
import type { PageData } from './$types';
|
||||||
import * as m from '$lib/paraglide/messages.js';
|
import * as m from '$lib/paraglide/messages.js';
|
||||||
import { audioStore } from '$lib/audio.svelte';
|
import { audioStore } from '$lib/audio.svelte';
|
||||||
@@ -22,6 +23,9 @@
|
|||||||
let settingsPanelOpen = $state(false);
|
let settingsPanelOpen = $state(false);
|
||||||
let settingsTab = $state<'reading' | 'listening'>('reading');
|
let settingsTab = $state<'reading' | 'listening'>('reading');
|
||||||
|
|
||||||
|
// ── Currently reading modal ───────────────────────────────────────────────
|
||||||
|
let readingModalOpen = $state(false);
|
||||||
|
|
||||||
const READER_FONTS = [
|
const READER_FONTS = [
|
||||||
{ id: 'system', label: 'System' },
|
{ id: 'system', label: 'System' },
|
||||||
{ id: 'serif', label: 'Serif' },
|
{ id: 'serif', label: 'Serif' },
|
||||||
@@ -517,6 +521,18 @@
|
|||||||
|
|
||||||
<!-- Chapter heading + meta + language switcher -->
|
<!-- Chapter heading + meta + language switcher -->
|
||||||
<div class="mb-6">
|
<div class="mb-6">
|
||||||
|
<!-- Book title — tappable, opens Currently Reading modal -->
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onclick={() => (readingModalOpen = true)}
|
||||||
|
class="flex items-center gap-1 text-(--color-muted) hover:text-(--color-brand) text-sm font-medium transition-colors mb-1.5 max-w-full"
|
||||||
|
title="Switch book"
|
||||||
|
>
|
||||||
|
<span class="truncate">{data.book.title}</span>
|
||||||
|
<svg class="w-3.5 h-3.5 shrink-0 opacity-60" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
<p class="text-xs font-semibold text-(--color-brand) uppercase tracking-widest mb-1.5">
|
<p class="text-xs font-semibold text-(--color-brand) uppercase tracking-widest mb-1.5">
|
||||||
{m.reader_chapter_n({ n: String(data.chapter.number) })}
|
{m.reader_chapter_n({ n: String(data.chapter.number) })}
|
||||||
</p>
|
</p>
|
||||||
@@ -1315,3 +1331,11 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
<!-- Currently Reading modal -->
|
||||||
|
{#if readingModalOpen}
|
||||||
|
<CurrentlyReadingModal
|
||||||
|
currentSlug={data.book.slug}
|
||||||
|
onclose={() => (readingModalOpen = false)}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
|||||||
Reference in New Issue
Block a user