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
192 lines
6.2 KiB
TypeScript
192 lines
6.2 KiB
TypeScript
import { createContext, useContext, useEffect, useRef } from 'react'
|
|
import type { ElementKey } from '@faunosteo/core-wasm/types'
|
|
import type {
|
|
AnnotationSection,
|
|
EditorTarget,
|
|
FocusRequest,
|
|
} from './navigation'
|
|
import { MORE_BUTTON_ID, type EditorTabId } from './tabs'
|
|
|
|
export type { FocusRequest }
|
|
|
|
/**
|
|
* What a place did with a request: `found` the element and focused it, `kept` a creation
|
|
* or tracing in progress instead of jumping, `none` when it holds no such element.
|
|
*/
|
|
export type FocusOutcome = 'found' | 'kept' | 'none'
|
|
|
|
/**
|
|
* The `data-place` name of a place. `citations` (the panel) is no navigation target: it
|
|
* is a name only for its heading and its focus scope.
|
|
*/
|
|
export type PlaceName =
|
|
| EditorTabId
|
|
| `annotations.${AnnotationSection}`
|
|
| 'citations'
|
|
|
|
export function placeOf(target: EditorTarget): PlaceName {
|
|
if (target.tab !== 'annotations') return target.tab
|
|
return `annotations.${target.section ?? 'drawing'}`
|
|
}
|
|
|
|
/** The request, only when `place` is the one its target names (a hidden place never answers). */
|
|
export function ownedBy(
|
|
focus: FocusRequest | undefined,
|
|
place: PlaceName,
|
|
): FocusRequest | undefined {
|
|
return focus && placeOf(focus.target) === place ? focus : undefined
|
|
}
|
|
|
|
/** The attributes that make a row of a list reachable by a focus request. */
|
|
export function focusAttrs(key: ElementKey) {
|
|
return {
|
|
'data-focus-key': JSON.stringify(key),
|
|
tabIndex: -1,
|
|
} as const
|
|
}
|
|
|
|
/** The ring a programmatically focused row shows. */
|
|
export const FOCUS_CLASS =
|
|
'focus:outline focus:outline-2 focus:outline-[var(--color-accent)]'
|
|
|
|
/** The workspace's answer to a handled request: it clears it, so a remount never replays. */
|
|
export const FocusConsumedContext = createContext<
|
|
(serial: number, outcome: FocusOutcome) => void
|
|
>(() => undefined)
|
|
|
|
/** Says something to the polite live region of the workspace. */
|
|
export const AnnounceContext = createContext<(text: string) => void>(
|
|
() => undefined,
|
|
)
|
|
|
|
/**
|
|
* Runs `apply` once per request, after the place has rendered, then reports the outcome.
|
|
* The workspace passes a request only to the place its target names.
|
|
*/
|
|
export function useFocusRequest(
|
|
focus: FocusRequest | undefined,
|
|
apply: (target: EditorTarget) => FocusOutcome,
|
|
): void {
|
|
const handled = useRef<number | null>(null)
|
|
const consumed = useContext(FocusConsumedContext)
|
|
useEffect(() => {
|
|
if (!focus || handled.current === focus.serial) return
|
|
handled.current = focus.serial
|
|
consumed(focus.serial, apply(focus.target))
|
|
}, [focus, apply, consumed])
|
|
}
|
|
|
|
/** The first element matching `selector` (and `accept`) that no hidden place contains. */
|
|
export function visibleElement(
|
|
selector: string,
|
|
accept: (element: HTMLElement) => boolean = () => true,
|
|
): HTMLElement | null {
|
|
const found = [...document.querySelectorAll<HTMLElement>(selector)]
|
|
return (
|
|
found.find((element) => !element.closest('[hidden]') && accept(element)) ??
|
|
null
|
|
)
|
|
}
|
|
|
|
/** Scrolls to and focuses the visible row tagged with `key`; false when there is none. */
|
|
export function focusRow(key: ElementKey): boolean {
|
|
const wanted = JSON.stringify(key)
|
|
const row = [
|
|
...document.querySelectorAll<HTMLElement>('[data-focus-key]'),
|
|
].find(
|
|
(candidate) =>
|
|
candidate.dataset.focusKey === wanted && !candidate.closest('[hidden]'),
|
|
)
|
|
if (!row) return false
|
|
row.scrollIntoView?.({ block: 'center' })
|
|
row.focus()
|
|
return true
|
|
}
|
|
|
|
/** Row-based places (Général, Vues, Catégories, Régions, Références): focus the named row. */
|
|
export function useRowFocus(focus: FocusRequest | undefined): void {
|
|
useFocusRequest(focus, (target) =>
|
|
target.key && focusRow(target.key) ? 'found' : 'none',
|
|
)
|
|
}
|
|
|
|
/** Input types that take no typed text: Escape there is not the field's. */
|
|
const NON_TEXT_INPUTS = new Set([
|
|
'checkbox',
|
|
'radio',
|
|
'range',
|
|
'button',
|
|
'submit',
|
|
'reset',
|
|
'color',
|
|
'file',
|
|
'image',
|
|
])
|
|
|
|
/** A field that takes typed text (or a choice): Escape there belongs to the field. */
|
|
export function isTextField(target: EventTarget | null): boolean {
|
|
if (target instanceof HTMLInputElement)
|
|
return !NON_TEXT_INPUTS.has(target.type)
|
|
return (
|
|
target instanceof HTMLTextAreaElement ||
|
|
target instanceof HTMLSelectElement ||
|
|
(target instanceof HTMLElement &&
|
|
target.closest('[contenteditable="true"]') !== null)
|
|
)
|
|
}
|
|
|
|
/**
|
|
* Commits the text being typed before a place is left: blurs the focused field, so its
|
|
* `TextField` commits on blur. Safari and iPadOS do not move the focus to a tapped button,
|
|
* so the blur is forced rather than assumed. Answers whether a field was blurred.
|
|
*/
|
|
export function commitFocusedField(): boolean {
|
|
const active = document.activeElement
|
|
const isField = isTextField(active)
|
|
if (isField) (active as HTMLElement).blur()
|
|
return isField
|
|
}
|
|
|
|
/** The tab shown, or « Plus » while the shown tab sits in the closed list. */
|
|
function activeTabButton(): HTMLElement | null {
|
|
return (
|
|
document.querySelector<HTMLElement>('[role="tab"][aria-selected="true"]') ??
|
|
document.getElementById(MORE_BUTTON_ID)
|
|
)
|
|
}
|
|
|
|
/** Gives the focus to the shown tab's button: a lost focus must not leave on `body`. */
|
|
export function focusActiveTab(): void {
|
|
activeTabButton()?.focus()
|
|
}
|
|
|
|
/** The element holding the focus, when it is something other than `body`. */
|
|
export function heldElement(): HTMLElement | null {
|
|
const active = document.activeElement
|
|
return active instanceof HTMLElement && active !== document.body
|
|
? active
|
|
: null
|
|
}
|
|
|
|
/**
|
|
* After the render that hides parts: `held` (taken before) that left the page or sits in a
|
|
* hidden part hands its focus to the shown tab; one still shown gets its focus back when
|
|
* the commit blurred it (never `body`), and the tab takes it if the element refuses.
|
|
*/
|
|
export function refocusIfHidden(held: HTMLElement | null): void {
|
|
if (!held) return
|
|
const gone = !held.isConnected || held.closest('[hidden]')
|
|
if (!gone && document.activeElement !== held) held.focus()
|
|
if (gone || document.activeElement !== held) focusActiveTab()
|
|
}
|
|
|
|
/**
|
|
* The editor turned read-only: commits the text being typed, then whatever held the focus
|
|
* in a now hidden part gives it to the shown tab, never to `body`.
|
|
*/
|
|
export function releaseEditFocus(): void {
|
|
const held = heldElement()
|
|
commitFocusedField()
|
|
refocusIfHidden(held)
|
|
}
|