Every one of these was silent at the code level and loud in a real
browser; each fix carries its own tripwire (render pin, unit pin, or
CSP-safe rewrite) so the class cannot quietly return.
1. Theme picker dead since the CSP migration (eb57b720): the Appearance
panel's theme buttons emitted `@click="selectTheme(opt.Name)"` as
LITERAL text (templ gotcha #1 — quoted attribute values are never
interpolated; `opt` is a Go loop var), so Alpine threw "Undefined
variable: opt" on every click and no PUT /api/auth/theme ever fired.
The wood-paneling sibling always used the correct expression form,
which is why the panel half-worked. Fixed to the interpolated form;
TestThemePickerHandlersAreInterpolated pins that real theme names
reach the HTML and the raw identifier never does.
2. Filter-builder op dropdown "does nothing": the field ingest
hardcoded `ops: []` into every field's meta while only mirroring the
ops into the global label registry — opsFor() returned [] for EVERY
field, so the op menu rendered zero items: an invisible menu, no
console error (user tried author/publisher/title/subtitle, all
equally dead). FieldMeta.ops is now the wire's op objects, opsFor()
is a standalone exported helper, and opsForField unit tests pin the
round-trip. Verified live: the field menu opens/closes while the op
menu stayed shut, both with identical wiring — the difference was
the data, not the wiring.
3. AND/OR connective chip dead: the chip carried an `if` STATEMENT in
the Alpine attribute (`@click="if (row.chipClickable) ..."`) which
the CSP build's evaluator rejects as a statement — the whole
expression silently never ran. Moved the clickability check into a
toggleConnective(row) component method; the attribute is now a plain
method call.
4. Pencil vs card navigation race: navigateToCollection guarded with
`event.target instanceof HTMLElement`, which is FALSE for the
pencil glyph's SVGElement — a click landing on the glyph sailed past
the guard and navigated while the htmx edit-modal request still
fired (the reported "modal flashes, then the builder page"). The
guard now uses target.closest("button") (works on SVGElement) and
takes $event explicitly instead of the deprecated window.event.
.icon-btn is already a 36px square, so no hit-area change needed.
5. Add Items modal under the sidebar + taller than the window: the
picker overlay sat at z-50 UNDER the app-sidebar's z-60 (its left
edge rendered beneath the nav), and the card had no height bound —
header + tabs + filters + grid + footer overflow short windows with
the footer unreachable (fixed overlay, no page scroll). The picker
and create-modal overlays move to z-[65], both confirm dialogs to
z-[70], and the picker card is now a flex column capped at
max-h-[85vh] whose grids flex-fill (they grow on tall windows,
shrink on short ones). The ladder is documented at .app-sidebar in
input.css: sidebar 60 / overlays 65 / confirm 70 / toasts 9999.
Found by clicking every control the way a user does (panel clicks +
computed-style reads + screenshots) after the previous sweep trusted
DOM-text snapshots, which show hidden menus' text and cannot see
occlusion, stacking, or geometry at all.
174 lines
9.4 KiB
Templ
174 lines
9.4 KiB
Templ
package templates
|
|
|
|
templ CollectionModal(collection CollectionData) {
|
|
<div x-data="collections" class="fixed inset-0 z-[65] flex items-center justify-center p-4" style="background-color: var(--surface-overlay);">
|
|
<div class="card p-6 w-full max-w-md" style="box-shadow: var(--shadow-pop);">
|
|
<div class="flex justify-between items-center mb-6">
|
|
<div class="flex items-center gap-3">
|
|
<span class="grid place-items-center h-10 w-10 rounded-xl shrink-0" style="background-color: var(--accent-muted); color: var(--accent);">
|
|
@Icon("folder", "h-5 w-5")
|
|
</span>
|
|
if collection.ID != "" {
|
|
<h2 class="text-xl font-bold" style="color: var(--text-primary)">Edit Collection</h2>
|
|
} else {
|
|
<h2 class="text-xl font-bold" style="color: var(--text-primary)">Create Collection</h2>
|
|
}
|
|
</div>
|
|
<button type="button" @click="closeCollectionModal()" class="icon-btn" aria-label="Close">
|
|
@Icon("close", "h-5 w-5")
|
|
</button>
|
|
</div>
|
|
if collection.ID != "" {
|
|
<form
|
|
hx-put={ "/api/collections/" + collection.ID }
|
|
hx-redirect="/collections"
|
|
>
|
|
<input type="hidden" name="id" value={ collection.ID }/>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Name</label>
|
|
<input
|
|
type="text"
|
|
name="name"
|
|
value={ collection.Name }
|
|
required
|
|
class="input"
|
|
placeholder="My Reading List"
|
|
/>
|
|
</div>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Description</label>
|
|
<textarea
|
|
name="description"
|
|
class="input"
|
|
placeholder="Optional description"
|
|
rows="3"
|
|
>{ collection.Description }</textarea>
|
|
</div>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Icon</label>
|
|
<input
|
|
type="text"
|
|
id="icon-search"
|
|
class="input mb-2"
|
|
placeholder="Search or type emoji..."
|
|
maxlength="4"
|
|
@input="filterIcons($event.target.value)"
|
|
@focus="showAllIcons()"
|
|
/>
|
|
<input type="hidden" name="icon" id="collection-icon" value={ collection.Icon }/>
|
|
<div
|
|
id="icon-grid"
|
|
class="grid grid-cols-8 gap-1 max-h-32 overflow-y-auto p-2 rounded-lg border"
|
|
style="background-color: var(--bg-primary); border-color: var(--border);"
|
|
></div>
|
|
</div>
|
|
<div class="mb-6">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Color</label>
|
|
<div class="flex gap-2">
|
|
<button type="button" @click="selectColor('blue')" data-color="blue" class="w-8 h-8 rounded-full color-option bg-blue-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-blue-400" aria-label="Blue"></button>
|
|
<button type="button" @click="selectColor('red')" data-color="red" class="w-8 h-8 rounded-full color-option bg-red-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-red-400" aria-label="Red"></button>
|
|
<button type="button" @click="selectColor('yellow')" data-color="yellow" class="w-8 h-8 rounded-full color-option bg-yellow-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-yellow-400" aria-label="Yellow"></button>
|
|
<button type="button" @click="selectColor('green')" data-color="green" class="w-8 h-8 rounded-full color-option bg-green-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-green-400" aria-label="Green"></button>
|
|
<button type="button" @click="selectColor('purple')" data-color="purple" class="w-8 h-8 rounded-full color-option bg-purple-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-purple-400" aria-label="Purple"></button>
|
|
</div>
|
|
<input type="hidden" name="color" id="collection-color" value={ collection.Color }/>
|
|
<div class="mb-4 space-y-2">
|
|
<label class="flex items-center gap-2 text-sm" style="color: var(--text-primary);">
|
|
<input type="hidden" name="hide_finished" value="false"/>
|
|
<input type="checkbox" name="hide_finished" value="true" checked?={ collection.HideFinished } class="h-4 w-4 accent-current"/>
|
|
<span>Hide finished books (reading-queue mode)</span>
|
|
</label>
|
|
<label class="flex items-center gap-2 text-sm" style="color: var(--text-primary);">
|
|
<input type="hidden" name="show_up_next" value="false"/>
|
|
<input type="checkbox" name="show_up_next" value="true" checked?={ collection.ShowUpNext } class="h-4 w-4 accent-current"/>
|
|
<span>Show Up Next strip</span>
|
|
</label>
|
|
</div>
|
|
</div>
|
|
<div class="flex justify-end space-x-3">
|
|
<button type="button" @click="closeCollectionModal()" class="btn btn-secondary">Cancel</button>
|
|
<button type="submit" class="btn btn-primary">Update Collection</button>
|
|
</div>
|
|
</form>
|
|
} else {
|
|
<form
|
|
hx-post="/api/collections"
|
|
hx-redirect="/collections"
|
|
>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Type</label>
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<label class="relative cursor-pointer">
|
|
<input type="radio" name="collection_type" value="static" checked class="peer sr-only"/>
|
|
<div class="p-3 rounded-lg border text-center peer-checked:border-blue-500" style="background-color: var(--bg-primary); border-color: var(--border);">
|
|
<span class="font-semibold text-sm" style="color: var(--text-primary)">Static</span>
|
|
<p class="text-xs mt-1" style="color: var(--text-secondary)">Pick books by hand</p>
|
|
</div>
|
|
</label>
|
|
<label class="relative cursor-pointer">
|
|
<input type="radio" name="collection_type" value="smart" class="peer sr-only"/>
|
|
<div class="p-3 rounded-lg border text-center peer-checked:border-blue-500 peer-checked:ring-2 peer-checked:ring-blue-400" style="background-color: var(--bg-primary); border-color: var(--border);">
|
|
<span class="font-semibold text-sm" style="color: var(--text-primary)">⚡ Smart</span>
|
|
<p class="text-xs mt-1" style="color: var(--text-secondary)">Match books by rules — always live</p>
|
|
</div>
|
|
</label>
|
|
</div>
|
|
</div>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Name</label>
|
|
<input
|
|
type="text"
|
|
name="name"
|
|
required
|
|
class="input"
|
|
placeholder="My Reading List"
|
|
/>
|
|
</div>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Description</label>
|
|
<textarea
|
|
name="description"
|
|
class="input"
|
|
placeholder="Optional description"
|
|
rows="3"
|
|
></textarea>
|
|
</div>
|
|
<div class="mb-4">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Icon</label>
|
|
<input
|
|
type="text"
|
|
id="icon-search"
|
|
class="input mb-2"
|
|
placeholder="Search or type emoji..."
|
|
maxlength="4"
|
|
@input="filterIcons($event.target.value)"
|
|
@focus="showAllIcons()"
|
|
/>
|
|
<input type="hidden" name="icon" id="collection-icon" value={ collection.Icon }/>
|
|
<div
|
|
id="icon-grid"
|
|
class="grid grid-cols-8 gap-1 max-h-32 overflow-y-auto p-2 rounded-lg border"
|
|
style="background-color: var(--bg-primary); border-color: var(--border);"
|
|
></div>
|
|
</div>
|
|
<div class="mb-6">
|
|
<label class="block text-xs font-semibold uppercase tracking-wide mb-2" style="color: var(--text-secondary)">Color</label>
|
|
<div class="flex gap-2">
|
|
<button type="button" @click="selectColor('blue')" data-color="blue" class="w-8 h-8 rounded-full color-option bg-blue-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-blue-400" aria-label="Blue"></button>
|
|
<button type="button" @click="selectColor('red')" data-color="red" class="w-8 h-8 rounded-full color-option bg-red-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-red-400" aria-label="Red"></button>
|
|
<button type="button" @click="selectColor('yellow')" data-color="yellow" class="w-8 h-8 rounded-full color-option bg-yellow-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-yellow-400" aria-label="Yellow"></button>
|
|
<button type="button" @click="selectColor('green')" data-color="green" class="w-8 h-8 rounded-full color-option bg-green-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-green-400" aria-label="Green"></button>
|
|
<button type="button" @click="selectColor('purple')" data-color="purple" class="w-8 h-8 rounded-full color-option bg-purple-500 hover:ring-2 hover:ring-offset-2 hover:ring-offset-transparent hover:ring-purple-400" aria-label="Purple"></button>
|
|
</div>
|
|
<input type="hidden" name="color" id="collection-color" value="blue"/>
|
|
</div>
|
|
<div class="flex justify-end space-x-3">
|
|
<button type="button" @click="closeCollectionModal()" class="btn btn-secondary">Cancel</button>
|
|
<button type="submit" class="btn btn-primary">Create Collection</button>
|
|
</div>
|
|
</form>
|
|
}
|
|
</div>
|
|
</div>
|
|
}
|