feat(editor): fifth tab « Références », citations panel from a finding

The reference library moves into a fifth editor tab (Général,
Annotations, Constats, Références, Vérification; under « Plus » below
640 px with Général and Constats). The header « Références » button is
removed. The side panel becomes the citations list of one finding,
opened only from a finding's trigger (owner GO 2026-11-12: never from a
family; the family keeps its inline list with « Retirer »). Selecting a
tab closes it; every close records one pending move applied after the
panel is gone, focus back to the trigger else the active tab button.
Vérification's reference issues land on the tab. e2e seed gains a
reference cited by « Constat A ».

Gates: typecheck, lint, test:run (app 1396), build, e2e:ui 251 passed;
e2e:shell 15 specs on db:sandbox (editor-equine never listed): 107
passed / 95 skipped / 2 failed (test remap dropped its edit), fixed and
rerun: editor-shell.spec 11 passed; full-row data guard: no
pre-existing row changed in any table. editor-equine.spec.ts helper
calls updated, not run.

## R-24 table (removed or rewritten assertions; old = fc3fec7 line, new = current file)

Unit tests:

| file:old line | old | new |
|---|---|---|
| editor-verification.test.tsx:87-96 | `navigate` called with target AND `expect.any(HTMLElement)` | called with the target only (opener dropped) |
| editor-verification.test.tsx:238-241 | `references[0]` path -> `{place:'references', citedBy:null}` | `{place:'tab', tab:'references', section:null}` |
| editor-verification.test.tsx:262-264 | `placeKey(references[9])` = `editor.place.references` | `editor.tab.references` |
| editor-navigation.test.ts:63 | targetOfKey reference -> `{place:'references', key, citedBy:null}` | `{place:'tab', tab:'references', section:null, key}` |
| editor-navigation.test.ts:80 | `referencesMounted` false at start | `citationsOf` null and `libraryReset` 0 |
| editor-navigation.test.ts:95-110 | go_to a reference opens the panel over the place | go_to a reference shows the Références tab with its focus request |
| editor-navigation.test.ts:112-122 | go_to a tab closes the panel (`references` object) | same, via `citationsOf` null |
| editor-navigation.test.ts:124-136 | select_tab keeps the panel | select_tab CLOSES the panel (P21), keeps section, no request |
| editor-navigation.test.ts:138-146 | `clear_cited_by` drops the filter | removed (action gone); replaced by `open_citations` refuses family/zone/view, `show_all_references` (closes, tab, reset bump), plain go_to leaves reset alone |
| editor-navigation.test.ts:160-175 | open/close references keep tab and section | open/close citations, same assertions on `citationsOf` |
| editor-mode.test.ts:100-109 | tabsFor four tabs, small more = general, findings | five tabs, small more = general, findings, references |
| editor-route.test.tsx:46,50 | TABS four, title « four tabs » | five |
| editor-route.test.tsx:139-146 | 640-1023 px four tabs | five tabs, tablist has `flex-wrap` |
| editor-route.test.tsx:149-161 | « Plus » lists Général, Constats | lists Général, Constats, Références |
| editor-route.test.tsx:168-190 | header button opens panel, ✕ returns focus to button | no header button, panel not mounted at start (full panel flow moved to editor-references-panel.test.tsx) |
| editor-route.test.tsx:192-206 | Escape closes, panel content kept for next opening | removed: the panel is no longer kept mounted (design choice 3); Escape/close covered in editor-references-panel + editor-escape |
| editor-route.test.tsx:208-218 | read-only: panel lists references, no edit control | read-only: the Références tab lists them, no textbox, no add button; plus new: tab keeps mounted when left |
| editor-tabs-lists.test.tsx:47,75,114,130 | render `ReferencesPanel` | render `ReferencesTab` |
| editor-tabs-lists.test.tsx:77 | selector `#reference-ref-a-url` | `#tab-reference-ref-a-url` |
| editor-tabs-lists.test.tsx:131-135 | read-only buttons = only « Fermer les références » | no button at all |
| editor-focus-request.test.tsx:166-171,200-202,346 | `ReferencesPanel` with `panel` props and focus | `ReferenceLibrary` with focus (same assertions) |
| editor-focus-request.test.tsx:226 | `ownedBy(ref,'citations')` is the request | `ownedBy(ref,'references')` is the request, `'citations'` undefined |
| editor-focus-request.test.tsx (Probe) | none | new: Vérification « Aller à » reference -> tab + focused row; reference path naming no element -> tab heading |
| editor-keep-alive.test.tsx:71,178-190 | add form survives closing/reopening the panel | survives leaving/returning to the Références tab (`#tab-reference-new-citation`) |
| editor-keep-alive.test.tsx:300-326 | « Aller à » without focus move commits Références text | a tab click without focus move commits it (one undo entry): « Aller à » is not reachable from the Références tab in R2.1 |
| editor-keep-alive.test.tsx:333-347 | Escape in panel reference field commits, panel hides | same, panel opened from a finding node, field `#panel-reference-ref-1-citation` |
| editor-keep-alive.test.tsx:350-363 | header toggle (no focus move) closes after committing | scrim click (no focus move) closes after committing |
| editor-keep-alive.test.tsx:425 | `referencesButton` click in the all-places sweep | `Références` added to the tab loop |
| editor-escape.test.tsx:218-227 | header button toggle, Escape on body closes panel, annotation selection kept | trigger-opened panel (A5), Escape closes it, `aria-expanded` back to false, selection kept after returning to Annotations |
| editor-escape.test.tsx:255-266 | Escape from tab row closes panel | same from the Constats tab button |
| editor-no-loss.test.tsx:146-153 | reference creation form, in the panel | in the Références tab, id `tab-reference-new-citation` |
| editor-no-loss.test.tsx:285-291 | focused header button survives crossing | focused tab button (Constats) survives crossing: no header button left |
| editor-no-loss.test.tsx:293-307 | references search in panel keeps focus/text | same in the Références tab body |
| editor-no-loss.test.tsx:390-400 | `everyPlace` ends by opening the panel | visits Références in the tab loop, no panel open |
| editor-no-loss-decisions.test.tsx:248-259 | open references panel holds the decision back | REMOVED: the panel exists only over Constats, decisions live in Annotations (hidden then); « a widening on another tab opens nothing » (same file) covers the withholding |
| editor-route-recovery.test.tsx:93-97 | recovery offer: header button opens panel, `aria-labelledby` | tab Références shows `editor-tab-references` labelled by `editor-references-title` |
| editor-references-panel.test.tsx (all) | header-button-driven panel tests incl. search, order, add, « Aller à » | split: panel tests (finding path only) stay in this file; library tests moved to new editor-references-tab.test.tsx (search matching, ↑/↓ only without search, counts, Ctrl+Z, read-only, « Aller à », add clears search, refused add keeps it); new: reset signal, ids unique with both mounted (P14), P6 fallback under « Plus » |

e2e (updated only, not run):

| file:old line | old | new |
|---|---|---|
| editor-shell.spec.ts:95-108 | panel keeps form text, no id repeats | Références tab keeps form text (`#tab-reference-new-citation`), ids unique with the panel open |
| editor-shell.spec.ts:121-142 | open panel leaves header and tab row clickable (incl. header Références button, add form) | `openCitations`; header button target and form steps dropped |
| editor-shell-journeys.spec.ts:113-123 | four tabs, `old` list includes « Références » | five tabs, « Références » removed from the old-layout list |
| editor-shell-journeys.spec.ts:246-249 | Aller à reference -> panel visible, close | `place('references')` visible, tab Références selected, row focus key, no close |
| editor-shell-layout.spec.ts:84-103 | overflow on four tabs + panel over drawing | five tabs + `openCitations`/`closeCitations` |
| editor-shell-layout.spec.ts:54-63 | local `goToTab` | removed, uses `openTab` |
| editor-shell-layout.spec.ts:140-158 | canvas width without/with panel over the drawing | E1: width measured before open and after a P21 switch to Annotations, asserted equal |
| editor-shell-layout.spec.ts:161-189 | axe on four tabs + open panel | five tabs + citations panel |
| editor-shell-layout.spec.ts:~255-310 | keyboard order began with `header` (the Références button) | `header` dropped from both orders (no focusable header control while the draft is clean); panel test selects Annotations before walking to `side` |
| editor-access.spec.ts:150-152,191-194,219-220 | axe/overflow with the panel at 320/375/768/800, 1024, read-only | same checks through `openCitations` (`showDrawing` calls dropped) |
| editor-shell-crossing.spec.ts:194-206 | references form with panel open, tab `annotations` | in the tab, focus expected on `editor-tab-references` |
| editor-shell-crossing.spec.ts:264-282 | panel open + add-form text across crossing | citations panel over a crossing, no typed-text step |
| editor-shell-crossing.spec.ts:~385-410 | decision withheld while panel open, Reprendre | REMOVED (state unreachable, see unit row) |
| editor-deselect.spec.ts:226-229 | Escape closes header-opened panel, selection kept | opened via Constats, Escape, back to Annotations, selection kept |
| editor-structures.spec.ts:80-122 | two references added, counts 2/1 | shape now holds `ref-a`: counts 3/2, `nth(1)` after move, saved list `['Référence A','Seconde référence']`, no panel |
| editor-equine.spec.ts:304-305,404-405 | openReferences/closeReferences | `openTab(page, dict, 'references')`: mis à jour, non exécuté, non vérifié |

Fix round 1: 1. e2e/shell/editor-shell.spec.ts « the open citations panel leaves the header and the tab row clickable »: before `openCitations`, the test now opens the Références tab and adds a reference through the library form (`#tab-reference-new-type` book, `#tab-reference-new-citation` « Smith 1999 », « Ajouter la référence »), so the draft is dirty and Save is enabled. All original assertion
This commit is contained in:
bchanot committed 2026-11-12 20:29:27 +01:00
1 parent fc3fec7654
commit 4499bc740c
50 files changed
+1487 -917

No files matched your search

+3 -12
View File
@@ -45,19 +45,15 @@ function Breadcrumb({
}
/**
* The draft's header: breadcrumb, title and badges, then the actions (references, the
* save line, « Abandonner les modifications » and « Enregistrer » in edit mode).
* The draft's header: breadcrumb, title and badges, then the actions (the save line,
* « Abandonner les modifications » and « Enregistrer » in edit mode).
*/
export default function DraftHeader({
sheet,
mode,
referencesOpen,
onToggleReferences,
}: {
sheet: OfficialSheetAdmin
mode: EditorMode
referencesOpen: boolean
onToggleReferences: (opener: HTMLElement) => void
}) {
const t = useT()
const heading = usePageHeading()
@@ -85,12 +81,7 @@ export default function DraftHeader({
{t('editor.draft.read_only')}
</Badge>
)}
<HeaderActions
editable={mode === 'edit'}
referencesOpen={referencesOpen}
onToggleReferences={onToggleReferences}
onFailure={setFailure}
/>
<HeaderActions editable={mode === 'edit'} onFailure={setFailure} />
</div>
{failure && <Notice tone="error">{failure}</Notice>}
</header>
@@ -11,6 +11,7 @@ import KeptPlace from './KeptPlace'
import AnnotationsTab from './tabs/AnnotationsTab'
import FindingsTab from './tabs/FindingsTab'
import GeneralTab from './tabs/GeneralTab'
import ReferencesTab from './tabs/ReferencesTab'
import VerificationTab from './tabs/VerificationTab'
const BODIES: Record<
@@ -19,6 +20,7 @@ const BODIES: Record<
> = {
general: GeneralTab,
findings: FindingsTab,
references: ReferencesTab,
verification: VerificationTab,
}
@@ -64,7 +64,7 @@ function TabList({ shown, active, onSelect }: TabListProps) {
role="tablist"
aria-label={t('editor.tab.list')}
onKeyDown={onKeyDown}
className="flex gap-1"
className="flex flex-wrap gap-1"
>
{shown.map((tab) => (
<button
@@ -168,7 +168,8 @@ interface EditorTabsProps {
}
/**
* The draft's tab row (boards 04 and 05): the four tabs from 640 px, Annotations and
* The draft's tab row (boards 04 and 05): the five tabs from 640 px (the row may wrap
* between 640 and 1 023 px, never scroll sideways), Annotations and
* Vérification below it with « Plus » opening a disclosure of the others (no measurement).
* « Défaire » and « Refaire » sit at the right end of the row on every tab.
*/
@@ -2,11 +2,7 @@ import { useEffect, useRef, type ReactNode } from 'react'
import type { OfficialSheetAdmin } from '@faunosteo/supabase'
import Notice from '@/components/ui/Notice'
import { ReadOnlyContext, ReferencesOpenContext } from '@/editor/editingContext'
import {
AnnounceContext,
FocusConsumedContext,
ownedBy,
} from '@/editor/focusRequest'
import { AnnounceContext, FocusConsumedContext } from '@/editor/focusRequest'
import { saveFailureMessage } from '@/editor/messages'
import type { EditorMode } from '@/editor/mode'
import { useEditorStore } from '@/editor/state/editorStore'
@@ -78,26 +74,25 @@ interface PlacesProps {
}
/**
* Under the tab row: the tab panels and the references panel beside them. The container
* starts after the tab row, so the panel and its scrim never cover the header or the tabs;
* while the panel is open the tab panels are inert (the scrim sits over them).
* Under the tab row: the tab panels and the citations panel of a finding beside them. The
* container starts after the tab row, so the panel and its scrim never cover the header or
* the tabs; while the panel is open the tab panels are inert (the scrim sits over them).
*/
function Places({ nav, readOnly, reloadSheet }: PlacesProps) {
const { state } = nav
const open = state.references.open
const open = state.citationsOf !== null
return (
<div className={`relative ${open ? 'min-h-[calc(100dvh-3.5rem)]' : ''}`}>
{state.referencesMounted && (
{state.citationsOf && (
<KeptPlace
name="citations"
visible={open}
visible
className="absolute bottom-0 right-0 top-0 z-20 w-[min(27rem,100%)]"
>
<ReferencesPanel
readOnly={readOnly}
focus={ownedBy(state.focus, 'citations')}
onClose={nav.closeReferences}
citedBy={state.references.citedBy}
citedBy={state.citationsOf}
onClose={nav.closeCitations}
onShowAll={nav.showAllReferences}
/>
</KeptPlace>
@@ -106,7 +101,7 @@ function Places({ nav, readOnly, reloadSheet }: PlacesProps) {
<div
aria-hidden="true"
data-testid="references-scrim"
onClick={nav.closeReferences}
onClick={nav.closeCitations}
className="absolute inset-0 z-10 bg-[rgba(31,27,22,0.25)]"
/>
)}
@@ -116,6 +111,8 @@ function Places({ nav, readOnly, reloadSheet }: PlacesProps) {
visited={state.visitedTabs}
readOnly={readOnly}
navigate={nav.navigate}
openCitations={nav.openCitations}
libraryReset={state.libraryReset}
focus={state.focus}
reloadSheet={reloadSheet}
annotations={{
@@ -132,7 +129,7 @@ function Places({ nav, readOnly, reloadSheet }: PlacesProps) {
/**
* A keydown aimed at `body` (nothing focused) never reaches the workspace's own handler:
* while the references panel is open, Escape there closes it all the same, unless a
* while the citations panel is open, Escape there closes it all the same, unless a
* modal dialog is open or the key was already handled.
*/
function useBodyEscape(open: boolean, close: () => void) {
@@ -153,7 +150,7 @@ function useBodyEscape(open: boolean, close: () => void) {
}
/**
* The draft page once the version is ready: header, notices, tab row, the references
* The draft page once the version is ready: header, notices, tab row, the citations
* panel and the shown place. Owns the navigation state, so the first tab is known at
* mount (`initialTab`) and later edits never move the user off their tab.
*/
@@ -163,35 +160,30 @@ export default function EditorWorkspace(props: Props) {
const nav = useEditorNavigation(
previewState ? initialTab(previewState, tier) : 'annotations',
)
const { state } = nav
const toggleReferences = (opener: HTMLElement) =>
state.references.open
? nav.closeReferences()
: nav.openReferences(null, opener)
useBodyEscape(state.references.open, nav.closeReferences)
const open = nav.state.citationsOf !== null
useBodyEscape(open, nav.closeCitations)
return (
<EditingState readOnly={readOnly} referencesOpen={state.references.open}>
<EditingState readOnly={readOnly} referencesOpen={open}>
<div
className="space-y-4"
data-editor-workspace
onKeyDown={(event) => {
if (event.key !== 'Escape' || event.defaultPrevented) return
if (event.nativeEvent.isComposing || !state.references.open) return
if (event.nativeEvent.isComposing || !open) return
event.preventDefault()
nav.closeReferences()
nav.closeCitations()
}}
>
<DraftHeader
sheet={sheet}
mode={mode}
referencesOpen={state.references.open}
onToggleReferences={toggleReferences}
/>
<DraftHeader sheet={sheet} mode={mode} />
<ModeNotice mode={mode} sheet={sheet} />
<SaveFailureNotice />
<RecoveryNotice />
<CopyIssueNotice />
<EditorTabs active={state.tab} tier={tier} onSelect={nav.selectTab} />
<EditorTabs
active={nav.state.tab}
tier={tier}
onSelect={nav.selectTab}
/>
<FocusConsumedContext value={nav.consumed}>
<AnnounceContext value={nav.announce}>
<Places nav={nav} readOnly={readOnly} reloadSheet={reloadSheet} />
@@ -1,7 +1,5 @@
import Button from '@/components/ui/Button'
import Icon from '@/components/ui/Icon'
import { useEditorStore } from '@/editor/state/editorStore'
import { REFERENCES_BUTTON_ID } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
import DiscardButton from './DiscardButton'
import SaveLine from './SaveLine'
@@ -9,8 +7,6 @@ import SaveLine from './SaveLine'
interface Props {
/** Edit mode: « Abandonner » and « Enregistrer » are offered. */
editable: boolean
referencesOpen: boolean
onToggleReferences: (opener: HTMLElement) => void
/** A failed reload after a discard, worded for the notice under the header. */
onFailure: (message: string | null) => void
}
@@ -31,26 +27,10 @@ function SaveButton() {
)
}
/** The right group of the header: references, the save line, discard and save. */
/** The right group of the header: the save line, discard and save. */
export default function HeaderActions(props: Props) {
const t = useT()
return (
<div className="ml-auto flex flex-wrap items-center gap-2">
<Button
id={REFERENCES_BUTTON_ID}
type="button"
variant="secondary"
aria-expanded={props.referencesOpen}
aria-controls="editor-citations-panel"
onClick={(event) => props.onToggleReferences(event.currentTarget)}
>
<Icon name="book" size={16} className="mr-2" />
{t('editor.references.open')}
</Button>
<span
aria-hidden="true"
className="hidden h-6 w-px bg-[var(--color-border)] sm:block"
/>
<SaveLine />
{props.editable && (
<>
@@ -236,12 +236,7 @@ export function UnmeasuredHint({
<button
type="button"
className="underline"
onClick={(event) =>
navigate(
targetOfKey({ kind: 'view', id: viewId }),
event.currentTarget,
)
}
onClick={() => navigate(targetOfKey({ kind: 'view', id: viewId }))}
>
{t('editor.place.views')}
</button>
@@ -1,8 +1,10 @@
import { useContext } from 'react'
import ActionButton from '@/components/editor/fields/ActionButton'
import ReadOnlyValue from '@/components/editor/fields/ReadOnlyValue'
import SelectField from '@/components/editor/fields/SelectField'
import TextField from '@/components/editor/fields/TextField'
import Icon from '@/components/ui/Icon'
import { ReferencesOpenContext } from '@/editor/editingContext'
import {
patchElement,
type FindingItem,
@@ -18,6 +20,7 @@ interface ContentProps {
item: FindingItem
readOnly: boolean
edit: EditCommandApi
/** Opens the citations panel; given for a finding only, a family has no panel. */
onShowReferences?: (opener: HTMLElement) => void
}
@@ -45,7 +48,14 @@ export default function FindingContent(props: ContentProps) {
patch={patch}
/>
)}
<Citations {...props} ids={element.value.reference_ids} patch={patch} />
<Citations
{...props}
ids={element.value.reference_ids}
patch={patch}
onShowReferences={
element.kind === 'finding_node' ? props.onShowReferences : undefined
}
/>
</div>
)
}
@@ -119,6 +129,7 @@ function VetFlag({
}
function Citations({
item,
readOnly,
edit,
ids,
@@ -128,6 +139,7 @@ function Citations({
const t = useT()
const plural = usePlural()
const doc = useSheetDocument()
const panelOpen = useContext(ReferencesOpenContext)
const references = doc?.references ?? []
const citation = (id: string) =>
references.find((r) => r.id === id)?.citation ?? id
@@ -144,6 +156,9 @@ function Citations({
{ids.length > 0 && onShowReferences && (
<button
type="button"
data-citations-trigger={JSON.stringify(item.key)}
aria-expanded={panelOpen}
aria-controls="editor-citations-panel"
onClick={(event) => onShowReferences(event.currentTarget)}
className="inline-flex min-h-11 items-center gap-1 rounded-full border border-[var(--color-border)] px-3 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]"
>
@@ -14,7 +14,7 @@ export interface FindingDetailProps {
item: FindingItem
readOnly: boolean
onDelete: () => void
/** Opens the references panel filtered to this element. */
/** Opens the citations panel of this finding (a family has none). */
onShowReferences?: (opener: HTMLElement) => void
}
@@ -6,7 +6,7 @@ import SelectField from '@/components/editor/fields/SelectField'
import { isBlank, nullable } from '@/editor/sheetDocument'
import { useEditCommand } from '@/editor/useEditCommand'
import { useT } from '@/i18n/useT'
import { REFERENCE_TYPES } from './referenceTypes'
import { REFERENCE_TYPES, type ReferenceHost } from './referenceTypes'
const EMPTY = { type: '', citation: '', url: '', doi: '' }
@@ -14,7 +14,13 @@ const EMPTY = { type: '', citation: '', url: '', doi: '' }
* Adds a reference: the type and the citation are required, URL and DOI optional.
* `onAdded` runs after a successful add, so the list can show the new reference.
*/
export default function ReferenceForm({ onAdded }: { onAdded?: () => void }) {
export default function ReferenceForm({
host,
onAdded,
}: {
host: ReferenceHost
onAdded?: () => void
}) {
const t = useT()
const edit = useEditCommand()
const [form, setForm] = useState(EMPTY)
@@ -53,27 +59,27 @@ export default function ReferenceForm({ onAdded }: { onAdded?: () => void }) {
<p className="text-sm font-medium">{t('editor.reference.new')}</p>
<div className="grid gap-3">
<SelectField
id="reference-new-type"
id={`${host}-reference-new-type`}
label={t('editor.reference.type')}
value={form.type}
options={options}
onCommit={(type) => set({ type })}
/>
<DraftField
id="reference-new-citation"
id={`${host}-reference-new-citation`}
label={t('editor.reference.citation')}
value={form.citation}
onChange={(citation) => set({ citation })}
multiline
/>
<DraftField
id="reference-new-url"
id={`${host}-reference-new-url`}
label={t('editor.reference.url')}
value={form.url}
onChange={(url) => set({ url })}
/>
<DraftField
id="reference-new-doi"
id={`${host}-reference-new-doi`}
label={t('editor.reference.doi')}
value={form.doi}
onChange={(doi) => set({ doi })}
@@ -0,0 +1,112 @@
import { useEffect, useState } from 'react'
import type { ElementKey, Reference } from '@faunosteo/core-wasm/types'
import DeleteDialog, {
type DeleteTarget,
} from '@/components/editor/DeleteDialog'
import EditOnly from '@/components/editor/EditOnly'
import Input from '@/components/ui/Input'
import {
focusRow,
useFocusRequest,
type FocusRequest,
} from '@/editor/focusRequest'
import { citationCounts } from '@/editor/references/citations'
import { visibleReferences } from '@/editor/references/filter'
import { useSheetDocument } from '@/editor/sheetDocument'
import { useT } from '@/i18n/useT'
import ReferenceForm from './ReferenceForm'
import { EmptyLine, ReferenceList } from './ReferenceList'
interface Props {
readOnly: boolean
focus?: FocusRequest
/** Bumped by « Tout afficher »: the search is emptied once per bump. */
resetSignal?: number
}
/**
* « Aller à » a reference: the search is cleared first when it may hide the card, and the
* card is focused after the commit that shows it (it does not exist while hidden).
*/
function useReferenceFocus(
focus: FocusRequest | undefined,
query: string,
clearQuery: () => void,
) {
const [late, setLate] = useState<ElementKey | null>(null)
useEffect(() => {
if (late === null) return
focusRow(late)
setLate(null)
}, [late])
useFocusRequest(focus, (target) => {
if (target.key === null) return 'none'
if (query === '') return focusRow(target.key) ? 'found' : 'none'
clearQuery()
setLate(target.key)
return 'found'
})
}
/** The search text, emptied each time `resetSignal` changes (the tab stays mounted). */
function useSearchQuery(resetSignal: number) {
const [query, setQuery] = useState('')
const [seen, setSeen] = useState(resetSignal)
if (seen !== resetSignal) {
setSeen(resetSignal)
setQuery('')
}
return [query, setQuery] as const
}
/**
* The sheet's bibliography: a search, one card per reference with how often it is cited,
* the add form and the delete dialog. Lives in the Références tab (ids prefixed `tab-`).
*/
export default function ReferenceLibrary({
readOnly,
focus,
resetSignal = 0,
}: Props) {
const t = useT()
const doc = useSheetDocument()
const [query, setQuery] = useSearchQuery(resetSignal)
const [deleting, setDeleting] = useState<DeleteTarget | null>(null)
useReferenceFocus(focus, query, () => setQuery(''))
const all: readonly Reference[] = doc?.references ?? []
const shown = visibleReferences(all, null, query)
return (
<div className="space-y-3">
<Input
type="search"
aria-label={t('editor.references.search')}
placeholder={t('editor.references.search')}
value={query}
onChange={(event) => setQuery(event.target.value)}
/>
{doc && (
<>
<EmptyLine total={all.length} shown={shown.length} />
<ReferenceList
host="tab"
shown={shown}
all={all}
counts={citationCounts(doc)}
movable={query.trim() === ''}
readOnly={readOnly}
onDelete={(reference) =>
setDeleting({
key: { kind: 'reference', id: reference.id },
label: reference.citation,
})
}
/>
<EditOnly readOnly={readOnly}>
<ReferenceForm host="tab" onAdded={() => setQuery('')} />
</EditOnly>
</>
)}
<DeleteDialog target={deleting} onClose={() => setDeleting(null)} />
</div>
)
}
@@ -0,0 +1,44 @@
import type { Reference } from '@faunosteo/core-wasm/types'
import { useT } from '@/i18n/useT'
import ReferenceRow from './ReferenceRow'
import type { ReferenceHost } from './referenceTypes'
interface ListProps {
host: ReferenceHost
shown: readonly Reference[]
all: readonly Reference[]
counts: ReadonlyMap<string, number>
movable: boolean
readOnly: boolean
onDelete: (reference: Reference) => void
}
/** The cards of `shown`, each knowing its place in the whole bibliography `all`. */
export function ReferenceList({ shown, all, counts, ...rest }: ListProps) {
return (
<ul className="space-y-3">
{shown.map((reference) => (
<ReferenceRow
key={reference.id}
host={rest.host}
reference={reference}
index={all.indexOf(reference)}
count={all.length}
cited={counts.get(reference.id) ?? 0}
movable={rest.movable}
readOnly={rest.readOnly}
onDelete={() => rest.onDelete(reference)}
/>
))}
</ul>
)
}
/** The empty line: no reference at all, or none that matches. */
export function EmptyLine({ total, shown }: { total: number; shown: number }) {
const t = useT()
if (shown > 0) return null
const key =
total === 0 ? 'editor.reference.empty' : 'editor.references.no_match'
return <p className="text-sm text-[var(--color-ink-muted)]">{t(key)}</p>
}
@@ -8,12 +8,13 @@ import { isBlank, nullable } from '@/editor/sheetDocument'
import { useEditCommand } from '@/editor/useEditCommand'
import { usePlural } from '@/editor/plural'
import { useT } from '@/i18n/useT'
import { REFERENCE_TYPES } from './referenceTypes'
import { REFERENCE_TYPES, type ReferenceHost } from './referenceTypes'
const CARD = 'space-y-3 rounded-lg border border-[var(--color-border)] p-3'
/** One reference: fields commit one by one, ↑ / ↓ reorder, delete asks the core. */
export default function ReferenceRow({
host,
reference,
index,
count,
@@ -22,6 +23,8 @@ export default function ReferenceRow({
readOnly,
onDelete,
}: {
/** The place showing the row: its field ids carry it, both can be mounted at once. */
host: ReferenceHost
reference: Reference
/** Position in the whole bibliography, not in a filtered list. */
index: number
@@ -47,7 +50,7 @@ export default function ReferenceRow({
value: type,
label: t(`editor.reference.type.${type}`),
}))
const prefix = `reference-${reference.id}`
const prefix = `${host}-reference-${reference.id}`
return (
<li {...focusAttrs(key)} className={`${CARD} ${FOCUS_CLASS}`}>
<p className="text-right text-sm text-[var(--color-ink-muted)]">
@@ -1,67 +1,28 @@
import {
useEffect,
useMemo,
useRef,
useState,
type KeyboardEvent,
type RefObject,
} from 'react'
import type { ElementKey, Reference } from '@faunosteo/core-wasm/types'
import { useEffect, useMemo, useState, type KeyboardEvent } from 'react'
import type { ElementKey } from '@faunosteo/core-wasm/types'
import DeleteDialog, {
type DeleteTarget,
} from '@/components/editor/DeleteDialog'
import EditOnly from '@/components/editor/EditOnly'
import ReferenceForm from '@/components/editor/references/ReferenceForm'
import ReferenceRow from '@/components/editor/references/ReferenceRow'
import Icon from '@/components/ui/Icon'
import Input from '@/components/ui/Input'
import {
focusRow,
useFocusRequest,
type FocusRequest,
} from '@/editor/focusRequest'
import { useSheetDocument } from '@/editor/sheetDocument'
import { citationCounts } from '@/editor/references/citations'
import {
citedIds,
citingFinding,
visibleReferences,
} from '@/editor/references/filter'
import { useSheetDocument } from '@/editor/sheetDocument'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
import { ReferenceList } from './ReferenceList'
interface Props {
readOnly: boolean
focus?: FocusRequest
/** The finding whose citations the panel lists. */
citedBy: ElementKey
/** ✕, Escape, and the finding vanishing (deleted, or an undo removed it). */
onClose: () => void
/** The finding the list is filtered to (opened from its detail), if any. */
citedBy?: ElementKey | null
/** « Tout afficher »: drops the filter. */
onShowAll?: () => void
}
/**
* « Aller à » a reference: the search is cleared first when it may hide the card, and the
* card is focused after the commit that shows it (it does not exist while hidden).
*/
function useReferenceFocus(
focus: FocusRequest | undefined,
query: string,
clearQuery: () => void,
) {
const [late, setLate] = useState<ElementKey | null>(null)
useEffect(() => {
if (late === null) return
focusRow(late)
setLate(null)
}, [late])
useFocusRequest(focus, (target) => {
if (target.key === null) return 'none'
if (query === '') return focusRow(target.key) ? 'found' : 'none'
clearQuery()
setLate(target.key)
return 'found'
})
/** « Tout afficher »: closes the panel and opens the Références tab. */
onShowAll: () => void
}
function PanelHeader({ onClose }: { onClose: () => void }) {
@@ -89,7 +50,7 @@ function PanelHeader({ onClose }: { onClose: () => void }) {
)
}
/** The finding filter: « Citées par « nom » (n) » and « Tout afficher (N) ». */
/** « Citées par « nom » (n) » and « Tout afficher (N) ». */
function FilterChip({
name,
cited,
@@ -124,112 +85,32 @@ function FilterChip({
)
}
function SearchField({
value,
onChange,
inputRef,
}: {
value: string
onChange: (value: string) => void
inputRef: RefObject<HTMLInputElement | null>
}) {
const t = useT()
return (
<Input
ref={inputRef}
type="search"
aria-label={t('editor.references.search')}
placeholder={t('editor.references.search')}
value={value}
onChange={(event) => onChange(event.target.value)}
/>
)
}
interface ListProps {
shown: readonly Reference[]
all: readonly Reference[]
counts: ReadonlyMap<string, number>
movable: boolean
readOnly: boolean
onDelete: (reference: Reference) => void
}
function ReferenceList({ shown, all, counts, ...rest }: ListProps) {
return (
<ul className="space-y-3">
{shown.map((reference) => (
<ReferenceRow
key={reference.id}
reference={reference}
index={all.indexOf(reference)}
count={all.length}
cited={counts.get(reference.id) ?? 0}
movable={rest.movable}
readOnly={rest.readOnly}
onDelete={() => rest.onDelete(reference)}
/>
))}
</ul>
)
}
/** What the list shows: the finding filter (dropped once the finding is gone) and the query. */
function useShownReferences(
citedBy: ElementKey | null,
query: string,
onShowAll: (() => void) | undefined,
) {
/** The finding read from the current document; `gone` once the document lacks it. */
function useCitingFinding(citedBy: ElementKey, onGone: () => void) {
const doc = useSheetDocument()
const finding = useMemo(
() => (doc ? citingFinding(doc, citedBy) : null),
[doc, citedBy],
)
const gone = doc !== null && citedBy !== null && finding === null
const gone = doc !== null && finding === null
useEffect(() => {
if (gone) onShowAll?.()
}, [gone, onShowAll])
const all = doc?.references ?? []
const cited = finding ? citedIds(finding) : null
const shown = visibleReferences(all, cited, query)
return { doc, finding, all, cited, shown }
}
/** The empty line: no reference at all, or none that matches. */
function EmptyLine({ total, shown }: { total: number; shown: number }) {
const t = useT()
if (shown > 0) return null
const key =
total === 0 ? 'editor.reference.empty' : 'editor.references.no_match'
return <p className="text-sm text-[var(--color-ink-muted)]">{t(key)}</p>
if (gone) onGone()
}, [gone, onGone])
return { doc, finding }
}
/**
* The references side panel: the sheet's bibliography, filtered to the finding that opened
* it or searched, each reference with how often it is cited. Not a dialog: the page stays
* usable. The workspace mounts it at the first opening and keeps it (hidden) afterwards.
* The citations of one finding: the references it cites, each with how often it is cited.
* Not a dialog: the workspace makes the page behind it inert. Opened only from a finding's
* trigger; the whole library lives in the Références tab.
*/
export default function ReferencesPanel(props: Props) {
const { readOnly, focus, onClose, citedBy = null, onShowAll } = props
const { readOnly, citedBy, onClose, onShowAll } = props
const locale = useLocaleStore((s) => s.locale)
const searchRef = useRef<HTMLInputElement>(null)
const [query, setQuery] = useState('')
const [deleting, setDeleting] = useState<DeleteTarget | null>(null)
useReferenceFocus(focus, query, () => setQuery(''))
const { doc, finding, all, cited, shown } = useShownReferences(
citedBy,
query,
onShowAll,
)
const showAll = () => {
onShowAll?.()
searchRef.current?.focus()
}
// A new reference is neither cited by the filtered finding nor named by the search.
const showAdded = () => {
setQuery('')
if (citedBy !== null) onShowAll?.()
}
const { doc, finding } = useCitingFinding(citedBy, onClose)
const all = doc?.references ?? []
const cited = finding ? citedIds(finding) : []
const onKeyDown = (event: KeyboardEvent) => {
if (event.key !== 'Escape' || event.defaultPrevented) return
event.stopPropagation()
@@ -244,35 +125,29 @@ export default function ReferencesPanel(props: Props) {
className="sticky top-14 h-[calc(100dvh-3.5rem)] space-y-3 overflow-y-auto border-l border-[var(--color-border)] bg-[var(--color-surface)] p-4 shadow-xl"
>
<PanelHeader onClose={onClose} />
{finding && cited && (
{finding && (
<FilterChip
name={finding.name[locale]}
cited={cited.length}
total={all.length}
onShowAll={showAll}
onShowAll={onShowAll}
/>
)}
<SearchField value={query} onChange={setQuery} inputRef={searchRef} />
{doc && (
<>
<EmptyLine total={all.length} shown={shown.length} />
<ReferenceList
shown={shown}
all={all}
counts={citationCounts(doc)}
movable={cited === null && query.trim() === ''}
readOnly={readOnly}
onDelete={(reference) =>
setDeleting({
key: { kind: 'reference', id: reference.id },
label: reference.citation,
})
}
/>
<EditOnly readOnly={readOnly}>
<ReferenceForm onAdded={showAdded} />
</EditOnly>
</>
<ReferenceList
host="panel"
shown={visibleReferences(all, cited, '')}
all={all}
counts={citationCounts(doc)}
movable={false}
readOnly={readOnly}
onDelete={(reference) =>
setDeleting({
key: { kind: 'reference', id: reference.id },
label: reference.citation,
})
}
/>
)}
<DeleteDialog target={deleting} onClose={() => setDeleting(null)} />
</section>
@@ -8,3 +8,6 @@ export const REFERENCE_TYPES: readonly ReferenceType[] = [
'web',
'manual',
]
/** Where reference cards are shown: the Références tab or a finding's citations panel. */
export type ReferenceHost = 'tab' | 'panel'
@@ -64,7 +64,7 @@ function useFindingDeletion(
export default function FindingsTab({
readOnly,
focus,
navigate,
openCitations,
}: EditorPlaceProps) {
const t = useT()
const doc = useSheetDocument()
@@ -155,11 +155,8 @@ export default function FindingsTab({
item={selected}
readOnly={readOnly}
onDelete={() => askDelete(selected)}
onShowReferences={(opener) =>
navigate(
{ place: 'references', key: null, citedBy: selected.key },
opener,
)
onShowReferences={
openCitations && ((opener) => openCitations(selected.key, opener))
}
/>
)}
@@ -0,0 +1,33 @@
import ReferenceLibrary from '@/components/editor/references/ReferenceLibrary'
import type { EditorPlaceProps } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
/** The fifth tab: the sheet's reference library under its own heading. */
export default function ReferencesTab({
readOnly,
focus,
libraryReset,
}: EditorPlaceProps) {
const t = useT()
return (
<section
data-testid="editor-tab-references"
aria-labelledby="editor-references-title"
className="min-h-24 space-y-3"
>
<h2
id="editor-references-title"
tabIndex={-1}
data-place-heading
className="font-serif text-xl outline-none"
>
{t('editor.tab.references')}
</h2>
<ReferenceLibrary
readOnly={readOnly}
focus={focus}
resetSignal={libraryReset}
/>
</section>
)
}
@@ -44,9 +44,7 @@ export default function IssueList({
size="sm"
variant="secondary"
className="mt-2"
onClick={(event) =>
navigate(target.target, event.currentTarget)
}
onClick={() => navigate(target.target)}
>
{t('editor.verification.goto').replace(
'{tab}',