From 360b7d68e8ac26e7c692264cf30457440be9d3fd Mon Sep 17 00:00:00 2001 From: omggga Date: Sat, 12 Sep 2026 11:43:07 +0300 Subject: [PATCH 1/8] fix: save personal notes explicitly and align marker actions --- CHANGELOG.md | 6 ++ apps/web/src/map/DatasetMap.tsx | 8 -- apps/web/src/styles.css | 25 +++--- apps/web/src/user-data/CustomMarkerEditor.tsx | 90 ++++++------------- apps/web/src/user-data/EditorDrafts.test.tsx | 47 +++++++--- .../web/src/user-data/PlaceProgressEditor.tsx | 62 ++----------- apps/web/src/user-data/strings.ts | 8 +- tests/acceptance/poison-song.spec.ts | 8 +- tests/ui/map-workflows.visual.spec.ts | 16 ++-- 9 files changed, 104 insertions(+), 166 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..99b783b8 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changelog + +## 2026-09-12 + +- Changed personal notes and marker edits to save only with Save, preserving recoverable drafts without interrupting typing. +- Aligned personal marker actions with Delete on the left and Save consistently on the right in both note forms, and removed coordinates from the marker card header. diff --git a/apps/web/src/map/DatasetMap.tsx b/apps/web/src/map/DatasetMap.tsx index 9c91f77d..4c11f1f4 100644 --- a/apps/web/src/map/DatasetMap.tsx +++ b/apps/web/src/map/DatasetMap.tsx @@ -291,10 +291,6 @@ function regionExtent( ]; } -function formatCoordinate(value: number): string { - return Math.round(value).toLocaleString('en-US'); -} - function visibilityZoomFor( thresholds: readonly number[], zoom: number, @@ -2456,10 +2452,6 @@ function CustomMarkerCard({ {t('map.personalMarker')}

{marker.label}

-

- X {formatCoordinate(marker.position[0])} · Y{' '} - {formatCoordinate(marker.position[1])} -

p, .custom-marker-editor > p { margin: 7px 0 0; @@ -1666,19 +1662,22 @@ textarea:focus-visible, color: var(--paper-error); } -.custom-marker-coordinate { - margin: 8px 0 0; - color: var(--paper-muted); - font-family: var(--font-data); - font-size: 10px; -} - .custom-marker-editor form label:not(:first-child) { margin-top: 8px; } -.custom-marker-editor > button { - margin-top: 8px; +.custom-marker-editor__actions { + display: flex; + justify-content: space-between; + align-items: center; + gap: 8px; +} + +.custom-marker-editor__actions button[type="submit"] { + margin-left: auto; +} + +.custom-marker-editor form .custom-marker-editor__delete { border-color: #805845; color: #5b281e; background: #c09a78; diff --git a/apps/web/src/user-data/CustomMarkerEditor.tsx b/apps/web/src/user-data/CustomMarkerEditor.tsx index 958647b1..fdedc3b2 100644 --- a/apps/web/src/user-data/CustomMarkerEditor.tsx +++ b/apps/web/src/user-data/CustomMarkerEditor.tsx @@ -1,6 +1,4 @@ import { - useCallback, - useEffect, useId, useRef, useState, @@ -35,8 +33,6 @@ type MarkerOperation = | { readonly kind: 'save'; readonly revision: string } | { readonly kind: 'delete' }; -type SaveTrigger = 'auto' | 'manual'; - export interface CustomMarkerEditorProps { readonly marker: CustomMarkerRecord; readonly locale: Locale; @@ -119,7 +115,6 @@ export function CustomMarkerEditor({ const [confirmingDeleteId, setConfirmingDeleteId] = useState(null); const [feedback, setFeedback] = useState(null); const activeOperationRef = useRef(null); - const blockedAutosaveRevisionRef = useRef(null); const deleteButtonRef = useRef(null); const cancelDeleteButtonRef = useRef(null); const activeDraft = draft?.markerId === marker.id ? draft : null; @@ -129,10 +124,9 @@ export function CustomMarkerEditor({ const confirmingDelete = confirmingDeleteId === marker.id; const isDisabled = disabled || busy !== null; - const persist = useCallback(async ( + const persist = async ( nextLabel: string, nextNote: string, - trigger: SaveTrigger, ) => { const revision = `${nextLabel}\0${nextNote}`; if ( @@ -144,10 +138,6 @@ export function CustomMarkerEditor({ } if (nextLabel.trim() === marker.label && nextNote === marker.note) { clearStoredMarkerDraft({ markerId: marker.id, label: nextLabel, note: nextNote }); - blockedAutosaveRevisionRef.current = null; - return; - } - if (trigger === 'auto' && blockedAutosaveRevisionRef.current === revision) { return; } const operation: MarkerOperation = { kind: 'save', revision }; @@ -175,33 +165,19 @@ export function CustomMarkerEditor({ setFeedback({ markerId: marker.id, tone: 'error', - text: strings.operationFailed(errorText(error), strings.saveMarker), + text: strings.operationFailed(errorText(error), strings.save), }); } finally { - blockedAutosaveRevisionRef.current = revision; if (activeOperationRef.current === operation) { activeOperationRef.current = null; setBusy(null); } } - }, [database, disabled, marker, onSaved, strings]); - - useEffect(() => { - if ( - isDisabled || - label.trim().length === 0 || - (label.trim() === marker.label && note === marker.note) || - blockedAutosaveRevisionRef.current === `${label}\0${note}` - ) { - return undefined; - } - const timeoutId = window.setTimeout(() => void persist(label, note, 'auto'), 350); - return () => window.clearTimeout(timeoutId); - }, [isDisabled, label, marker.label, marker.note, note, persist]); + }; const save = (event: FormEvent) => { event.preventDefault(); - void persist(label, note, 'manual'); + void persist(label, note); }; const remove = async () => { @@ -239,20 +215,7 @@ export function CustomMarkerEditor({ return (
-
{ - const nextTarget = event.relatedTarget; - if ( - (nextTarget instanceof Node && event.currentTarget.contains(nextTarget)) || - (nextTarget instanceof HTMLElement && - nextTarget.closest('[data-skip-marker-autosave]')) - ) { - return; - } - void persist(label, note, 'auto'); - }} - > + { - blockedAutosaveRevisionRef.current = null; const nextDraft = { markerId: marker.id, label: event.currentTarget.value, note }; setDraft(nextDraft); writeStoredMarkerDraft(nextDraft); + setFeedback(null); }} /> @@ -277,32 +240,35 @@ export function CustomMarkerEditor({ value={note} disabled={isDisabled} onChange={(event) => { - blockedAutosaveRevisionRef.current = null; const nextDraft = { markerId: marker.id, label, note: event.currentTarget.value }; setDraft(nextDraft); writeStoredMarkerDraft(nextDraft); + setFeedback(null); }} /> - +
+ {!confirmingDelete ? ( + + ) : null} + +
- {!confirmingDelete ? ( - - ) : ( + {confirmingDelete ? (
- )} + ) : null} {currentFeedback ? (

{ await database.delete(); }); - it('restores an unsaved place note after an immediate unmount and persists it', async () => { + it('restores an unsaved place note and waits for Save before persisting it', async () => { const first = render( { expect(screen.getByRole('textbox', { name: 'Personal note' })).toHaveValue( 'Recovered after reload', ); + await new Promise((resolve) => window.setTimeout(resolve, 500)); + expect(await database.progress.get(progressKey(datasetId, placeId))).toBeUndefined(); + fireEvent.click(screen.getByRole('button', { name: 'Save' })); await waitFor(async () => { expect(await database.progress.get(progressKey(datasetId, placeId))).toMatchObject({ note: 'Recovered after reload', @@ -80,7 +83,7 @@ describe('editor crash-recovery drafts', () => { }); }); - it('autosaves a place note on blur without exposing a redundant save button', async () => { + it('keeps a place note editable across pauses and blur, saving the exact text only on Save', async () => { render( { ); const note = screen.getByRole('textbox', { name: 'Personal note' }); - fireEvent.change(note, { target: { value: 'Saved on focus out' } }); - expect(screen.queryByRole('button', { name: 'Save note' })).not.toBeInTheDocument(); + fireEvent.focus(note); + fireEvent.change(note, { target: { value: 'First line' } }); + await new Promise((resolve) => window.setTimeout(resolve, 500)); + expect(note).toBeEnabled(); + expect(await database.progress.get(progressKey(datasetId, placeId))).toBeUndefined(); + fireEvent.change(note, { target: { value: ' First line\nSecond line ' } }); fireEvent.blur(note); + await new Promise((resolve) => window.setTimeout(resolve, 500)); + expect(await database.progress.get(progressKey(datasetId, placeId))).toBeUndefined(); + fireEvent.click(screen.getByRole('button', { name: 'Save' })); await waitFor(async () => { expect(await database.progress.get(progressKey(datasetId, placeId))).toMatchObject({ - note: 'Saved on focus out', + note: ' First line\nSecond line ', }); }); expect(screen.getByRole('status')).toHaveTextContent('Saved.'); @@ -124,7 +134,7 @@ describe('editor crash-recovery drafts', () => { expect(await database.progress.get(progressKey(datasetId, placeId))).toBeUndefined(); }); - it('restores an unsaved marker edit after an immediate unmount and persists it', async () => { + it('restores marker name and note drafts and saves them together only on Save', async () => { const marker = await saveCustomMarker( database, { datasetId, label: 'Original label', note: '', position: [10, 20] }, @@ -137,13 +147,22 @@ describe('editor crash-recovery drafts', () => { fireEvent.change(screen.getByRole('textbox', { name: 'Marker name' }), { target: { value: 'Recovered marker' }, }); + fireEvent.change(screen.getByRole('textbox', { name: 'Personal note' }), { + target: { value: ' Marker note\nSecond line ' }, + }); + fireEvent.blur(screen.getByRole('textbox', { name: 'Personal note' })); first.unmount(); render(); expect(screen.getByRole('textbox', { name: 'Marker name' })).toHaveValue('Recovered marker'); + expect(screen.getByRole('textbox', { name: 'Personal note' })).toHaveValue(' Marker note\nSecond line '); + await new Promise((resolve) => window.setTimeout(resolve, 500)); + expect(await database.customMarkers.get(marker.id)).toMatchObject({ label: 'Original label', note: '' }); + fireEvent.click(screen.getByRole('button', { name: 'Save' })); await waitFor(async () => { expect(await database.customMarkers.get(marker.id)).toMatchObject({ label: 'Recovered marker', + note: ' Marker note\nSecond line ', }); }); }); @@ -174,7 +193,7 @@ describe('editor crash-recovery drafts', () => { ); render(); - fireEvent.click(screen.getByRole('button', { name: 'Delete marker' })); + fireEvent.click(screen.getByRole('button', { name: 'Delete' })); await waitFor(() => expect(screen.getByRole('button', { name: 'Cancel' })).toHaveFocus(), ); @@ -182,7 +201,7 @@ describe('editor crash-recovery drafts', () => { fireEvent.keyDown(screen.getByRole('group', { name: /Delete this marker/ }), { key: 'Escape' }); await waitFor(() => - expect(screen.getByRole('button', { name: 'Delete marker' })).toHaveFocus(), + expect(screen.getByRole('button', { name: 'Delete' })).toHaveFocus(), ); }); @@ -215,7 +234,7 @@ describe('editor crash-recovery drafts', () => { await waitFor(() => expect(saveProgress).toHaveBeenCalledTimes(2)); }); - it('stops a failed marker autosave until manual retry or a new edit', async () => { + it('keeps failed marker edits for manual retry without saving on subsequent edits', async () => { const marker = await saveCustomMarker( database, { datasetId, label: 'Original label', note: '', position: [10, 20] }, @@ -229,6 +248,7 @@ describe('editor crash-recovery drafts', () => { const labelInput = screen.getByRole('textbox', { name: 'Marker name' }); fireEvent.change(labelInput, { target: { value: 'Unsaved marker' } }); + fireEvent.click(screen.getByRole('button', { name: 'Save' })); await waitFor(() => expect(saveMarker).toHaveBeenCalledTimes(1)); expect(labelInput).toHaveValue('Unsaved marker'); expect(window.localStorage.getItem( @@ -238,17 +258,20 @@ describe('editor crash-recovery drafts', () => { await new Promise((resolve) => window.setTimeout(resolve, 500)); expect(saveMarker).toHaveBeenCalledTimes(1); - fireEvent.click(screen.getByRole('button', { name: 'Save marker' })); + fireEvent.click(screen.getByRole('button', { name: 'Save' })); await waitFor(() => expect(saveMarker).toHaveBeenCalledTimes(2)); await new Promise((resolve) => window.setTimeout(resolve, 500)); expect(saveMarker).toHaveBeenCalledTimes(2); fireEvent.change(labelInput, { target: { value: 'Edited again' } }); + await new Promise((resolve) => window.setTimeout(resolve, 500)); + expect(saveMarker).toHaveBeenCalledTimes(2); + fireEvent.click(screen.getByRole('button', { name: 'Save' })); await waitFor(() => expect(saveMarker).toHaveBeenCalledTimes(3)); const alert = await screen.findByRole('alert'); - expect(alert).toHaveTextContent('Select “Save marker” to try again.'); + expect(alert).toHaveTextContent('Select “Save” to try again.'); expect(alert).not.toHaveAttribute('aria-live'); expect(await database.customMarkers.get(marker.id)).toMatchObject({ label: 'Original label', @@ -270,7 +293,7 @@ describe('editor crash-recovery drafts', () => { const labelInput = screen.getByRole('textbox', { name: 'Marker name' }); fireEvent.change(labelInput, { target: { value: 'Keep this draft' } }); - fireEvent.click(screen.getByRole('button', { name: 'Delete marker' })); + fireEvent.click(screen.getByRole('button', { name: 'Delete' })); const confirmButton = screen.getByRole('button', { name: 'Yes, delete' }); expect(screen.getByRole('group', { name: /Delete this marker/ })).toBeInTheDocument(); clickTwiceBeforeRender(confirmButton); diff --git a/apps/web/src/user-data/PlaceProgressEditor.tsx b/apps/web/src/user-data/PlaceProgressEditor.tsx index 06677c88..f135956f 100644 --- a/apps/web/src/user-data/PlaceProgressEditor.tsx +++ b/apps/web/src/user-data/PlaceProgressEditor.tsx @@ -1,4 +1,4 @@ -import { useEffect, useId, useRef, useState, type FormEvent } from 'react'; +import { useId, useRef, useState, type FormEvent } from 'react'; import type { Locale, ProgressRecord, @@ -95,55 +95,11 @@ export function PlaceProgressEditor({ const [saving, setSaving] = useState<'status' | 'note' | null>(null); const [feedback, setFeedback] = useState(null); const activeOperationRef = useRef(null); - const noteSaveTimerRef = useRef(null); - const noteFormRef = useRef(null); - const recoveredNoteRef = useRef( - draft?.placeKey === placeKey ? draft.value : null, - ); const note = draft?.placeKey === placeKey ? draft.value : (progress?.note ?? ''); const status = progress?.status ?? 'unvisited'; const currentFeedback = feedback?.placeKey === placeKey ? feedback : null; const isDisabled = disabled || saving !== null; - useEffect( - () => () => { - if (noteSaveTimerRef.current !== null) { - window.clearTimeout(noteSaveTimerRef.current); - } - }, - [], - ); - - useEffect(() => { - const recoveredNote = recoveredNoteRef.current; - if (recoveredNote === null) { - return; - } - if (recoveredNote === (progress?.note ?? '')) { - clearStoredNoteDraft(placeKey, recoveredNote); - recoveredNoteRef.current = null; - return; - } - noteSaveTimerRef.current = window.setTimeout(() => { - noteSaveTimerRef.current = null; - noteFormRef.current?.requestSubmit(); - recoveredNoteRef.current = null; - }, 350); - return () => { - if (noteSaveTimerRef.current !== null) { - window.clearTimeout(noteSaveTimerRef.current); - noteSaveTimerRef.current = null; - } - }; - }, [placeKey, progress?.note]); - - const clearPendingNoteSave = () => { - if (noteSaveTimerRef.current !== null) { - window.clearTimeout(noteSaveTimerRef.current); - noteSaveTimerRef.current = null; - } - }; - const beginSave = (kind: SaveOperation['kind'], revision: string) => { if (disabled || activeOperationRef.current !== null) { return null; @@ -219,7 +175,6 @@ export function PlaceProgressEditor({ const saveNote = (event: FormEvent) => { event.preventDefault(); - clearPendingNoteSave(); void persistNote(note); }; @@ -244,7 +199,7 @@ export function PlaceProgressEditor({ -

+