From e60c38c6b8d6d9c006f7021f31f98d8c5a6dc5b5 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Tue, 17 Nov 2026 05:39:53 +0900 Subject: [PATCH] AI: address issue #97 --- frontend/src/App.tsx | 3 +- frontend/src/components/PostEditForm.test.tsx | 23 +- frontend/src/components/PostEditForm.tsx | 45 ++-- .../src/components/common/TabGroup.test.tsx | 20 +- frontend/src/components/common/TabGroup.tsx | 8 +- .../posts/import/PostImportRowForm.test.tsx | 15 +- .../posts/import/PostImportRowForm.tsx | 29 +- frontend/src/lib/postImportStorage.ts | 69 +---- frontend/src/lib/sessionStorage.ts | 58 ++++ frontend/src/lib/useSessionDraft.test.tsx | 249 ++++++++++++++++++ frontend/src/lib/useSessionDraft.ts | 180 +++++++++++++ .../src/lib/useUnsavedChangesGuard.test.tsx | 19 +- frontend/src/lib/useUnsavedChangesGuard.tsx | 67 +++-- frontend/src/pages/GekanatorPage.tsx | 9 + .../deerjikists/DeerjikistDetailPage.tsx | 9 +- .../pages/materials/MaterialDetailPage.tsx | 52 ++-- .../src/pages/materials/MaterialNewPage.tsx | 29 +- .../MaterialSyncSuppressionsPage.tsx | 27 +- frontend/src/pages/posts/PostDetailPage.tsx | 5 +- .../src/pages/posts/PostImportReviewPage.tsx | 72 +++-- .../src/pages/posts/PostImportSourcePage.tsx | 44 +--- frontend/src/pages/tags/NicoTagListPage.tsx | 40 ++- frontend/src/pages/tags/TagDetailPage.tsx | 37 ++- .../src/pages/theatres/TheatreDetailPage.tsx | 6 +- frontend/src/pages/users/SettingPage.tsx | 28 +- frontend/src/pages/wiki/WikiEditPage.test.tsx | 31 ++- frontend/src/pages/wiki/WikiEditPage.tsx | 25 +- frontend/src/pages/wiki/WikiNewPage.tsx | 13 +- frontend/src/test/render.tsx | 9 +- frontend/src/test/setup.ts | 1 + 30 files changed, 869 insertions(+), 353 deletions(-) create mode 100644 frontend/src/lib/sessionStorage.ts create mode 100644 frontend/src/lib/useSessionDraft.test.tsx create mode 100644 frontend/src/lib/useSessionDraft.ts diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index a6799ad..fd85461 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -379,7 +379,8 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => { {robots != null && } - + ({ })) describe ('PostEditForm', () => { + beforeEach (() => vi.clearAllMocks ()) + + it ('submits restored edits against their original version', async () => { + const post = buildPost ({ id: 8, versionNo: 4 }) + sessionStorage.setItem ('session-draft:1:anonymous:post:8:ja', JSON.stringify ({ + baseVersionNo: 3, title: 'restored title', tags: 'テストタグ', duration: '', + parentPostIds: '', originalCreatedFrom: null, originalCreatedBefore: null })) + postsApi.updatePost.mockResolvedValueOnce ({ ...post, versionNo: 5 }) + render () + + expect (screen.getByDisplayValue ('restored title')).toBeInTheDocument () + fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!) + + await waitFor (() => { + expect (postsApi.updatePost).toHaveBeenCalledWith ( + expect.objectContaining ({ title: 'restored title' }), + { baseVersionNo: 3 }, 'ja') + }) + expect (sessionStorage.getItem ('session-draft:1:anonymous:post:8:ja')).toBeNull () + }) + it ('submits edited post fields with the current base version', async () => { const onSave = vi.fn () const post = buildPost ({ diff --git a/frontend/src/components/PostEditForm.tsx b/frontend/src/components/PostEditForm.tsx index 99039d9..a32a391 100644 --- a/frontend/src/components/PostEditForm.tsx +++ b/frontend/src/components/PostEditForm.tsx @@ -1,5 +1,6 @@ -import { useEffect, useMemo, useState } from 'react' +import { useMemo, useState } from 'react' +import { useSessionDraft } from '@/lib/useSessionDraft' import { useLocale } from '@/lib/useLocale' import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField' import FieldError from '@/components/common/FieldError' @@ -56,17 +57,17 @@ const PostEditForm: FC = ({ post, onSave }) => { const locale = useLocale () const { label } = useUITranslation ('posts') const [disabled, setDisabled] = useState (false) - const [duration, setDuration] = useState (videoMsToDurationValue (post.videoMs)) const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = useValidationErrors () - const [originalCreatedBefore, setOriginalCreatedBefore] = - useState (post.originalCreatedBefore) - const [originalCreatedFrom, setOriginalCreatedFrom] = - useState (post.originalCreatedFrom) - const [parentPostIds, setParentPostIds] = - useState ((post.parentPosts ?? []).map (p => p.id).join (' ')) - const [tags, setTags] = useState (() => tagsToStr (post.tags)) - const [title, setTitle] = useState (post.title) + const { draft, setField, clearDraft } = useSessionDraft (`post:${post.id}:${locale}`, { + baseVersionNo: post.versionNo, + duration: videoMsToDurationValue (post.videoMs), + originalCreatedBefore: post.originalCreatedBefore, + originalCreatedFrom: post.originalCreatedFrom, + parentPostIds: (post.parentPosts ?? []).map (entry => entry.id).join (' '), + tags: tagsToStr (post.tags), title: post.title }) + const { baseVersionNo, duration, originalCreatedBefore, originalCreatedFrom, + parentPostIds, tags, title } = draft const videoFlg = useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'), @@ -83,6 +84,7 @@ const PostEditForm: FC = ({ post, onSave }) => { try { const data = await updatePost (postData, options, locale) + clearDraft ({ ...draft, baseVersionNo: data.versionNo }) onSave ({ ...post, versionNo: data.versionNo, title: data.title, @@ -132,7 +134,7 @@ const PostEditForm: FC = ({ post, onSave }) => { await update ({ id: post.id, title, tags, parentPostIds, duration: videoFlg ? duration : null, originalCreatedFrom, originalCreatedBefore }, - { baseVersionNo: post.versionNo, merge: true }) + { baseVersionNo, merge: true }) return } @@ -141,7 +143,7 @@ const PostEditForm: FC = ({ post, onSave }) => { await update ({ id: post.id, title, tags, parentPostIds, duration: videoFlg ? duration : null, originalCreatedFrom, originalCreatedBefore }, - { baseVersionNo: post.versionNo, force: true }) + { baseVersionNo, force: true }) return } } @@ -156,7 +158,7 @@ const PostEditForm: FC = ({ post, onSave }) => { await update ({ id: post.id, title, tags, parentPostIds, duration: videoFlg ? duration : null, originalCreatedFrom, originalCreatedBefore }, - { baseVersionNo: post.versionNo }) + { baseVersionNo }) } finally { @@ -164,11 +166,6 @@ const PostEditForm: FC = ({ post, onSave }) => { } } - useEffect (() => { - setTags (tagsToStr (post.tags)) - setDuration (videoMsToDurationValue (post.videoMs)) - }, [post]) - return (
@@ -177,28 +174,28 @@ const PostEditForm: FC = ({ post, onSave }) => { label={label ('shared:labels.title')} value={title ?? ''} disabled={disabled} - onChange={setTitle}/> + onChange={value => setField ('title', value)}/> + onChange={value => setField ('parentPostIds', value)}/> setField ('tags', value)} errors={fieldErrors.tags}/> {/* オリジナルの作成日時 */} setField ('originalCreatedFrom', value)} originalCreatedBefore={originalCreatedBefore} - setOriginalCreatedBefore={setOriginalCreatedBefore} + setOriginalCreatedBefore={value => setField ('originalCreatedBefore', value)} errors={groupedMessages ( fieldErrors.originalCreatedAt, fieldErrors.originalCreatedFrom, @@ -209,7 +206,7 @@ const PostEditForm: FC = ({ post, onSave }) => { value={duration} disabled={disabled} errors={fieldErrors.videoMs} - onChange={setDuration}/>)} + onChange={value => setField ('duration', value)}/>)} {/* 送信 */} + + + ) +} + +describe ('session drafts and navigation', () => { + beforeEach (() => sessionStorage.clear ()) + + it ('does not store pristine input or warn before it changes', () => { + renderWithProviders (, { route: '/editor' }) + expect (sessionStorage.getItem (storageKey)).toBeNull () + fireEvent.click (screen.getByText ('leave')) + expect (screen.getByLabelText ('location')).toHaveTextContent ('/away') + expect (screen.queryByRole ('dialog')).not.toBeInTheDocument () + }) + + it ('stores changed input immediately and restores it after remounting', () => { + const first = renderWithProviders () + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + expect (JSON.parse (sessionStorage.getItem (storageKey)!)).toEqual ({ + title: 'draft', file: null }) + first.unmount () + + renderWithProviders () + expect (screen.getByLabelText ('title')).toHaveValue ('draft') + }) + + it ('preserves input and storage when navigation is cancelled', async () => { + renderWithProviders (, { route: '/editor' }) + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + fireEvent.click (screen.getByText ('leave')) + fireEvent.click (await screen.findByRole ('button', { name: '取消' })) + + await waitFor (() => expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ()) + expect (screen.getByLabelText ('location')).toHaveTextContent ('/editor') + expect (screen.getByLabelText ('title')).toHaveValue ('draft') + expect (sessionStorage.getItem (storageKey)).toContain ('draft') + }) + + it ('discards both live input and its stored copy after confirmation', async () => { + renderWithProviders (, { route: '/editor' }) + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + fireEvent.click (screen.getByText ('leave')) + fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' })) + + await waitFor (() => { + expect (screen.getByLabelText ('location')).toHaveTextContent ('/away') + }) + expect (sessionStorage.getItem (storageKey)).toBeNull () + expect (screen.getByLabelText ('title')).toHaveValue ('original') + }) + + it ('warns for history navigation too', async () => { + renderWithProviders (, { route: '/editor' }) + fireEvent.click (screen.getByText ('leave')) + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + fireEvent.click (screen.getByText ('back')) + expect (await screen.findByRole ('dialog')).toBeInTheDocument () + expect (screen.getByLabelText ('location')).toHaveTextContent ('/away') + }) + + it ('clears successful submissions without prompting on their next navigation', () => { + renderWithProviders (, { route: '/editor' }) + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'saved' } }) + fireEvent.click (screen.getByText ('save')) + expect (screen.getByLabelText ('location')).toHaveTextContent ('/saved') + expect (sessionStorage.getItem (storageKey)).toBeNull () + expect (screen.queryByRole ('dialog')).not.toBeInTheDocument () + }) + + it ('retains drafts until a browser departure actually occurs', () => { + renderWithProviders () + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + const event = new Event ('beforeunload', { cancelable: true }) + window.dispatchEvent (event) + expect (event.defaultPrevented).toBe (true) + expect (sessionStorage.getItem (storageKey)).toContain ('draft') + + fireEvent (window, new Event ('pagehide')) + expect (sessionStorage.getItem (storageKey)).toBeNull () + expect (screen.getByLabelText ('title')).toHaveValue ('original') + }) + + it ('keeps dirty input across background data refreshes', () => { + const view = renderWithProviders () + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'my draft' } }) + view.rerender () + expect (screen.getByLabelText ('title')).toHaveValue ('my draft') + }) + + it ('preserves newly added list rows with an empty nullable selection', () => { + const ListEditor = () => { + const { draft, setDraft } = useSessionDraft ('list', [ + { platform: 'youtube' as string | null, code: 'original' }]) + return ( + <> + {JSON.stringify (draft)} + + ) + } + const first = renderWithProviders () + fireEvent.click (screen.getByText ('add row')) + first.unmount () + + renderWithProviders () + expect (JSON.parse (screen.getByLabelText ('rows').textContent!)).toEqual ([ + { platform: 'youtube', code: 'original' }, { platform: null, code: '' }]) + }) + + it ('does not restore a different resource or an inactive editor', () => { + sessionStorage.setItem (storageKey, JSON.stringify ({ title: 'private draft', file: null })) + const view = renderWithProviders () + expect (screen.getByLabelText ('title')).toHaveValue ('original') + view.rerender () + expect (screen.getByLabelText ('title')).toHaveValue ('original') + expect (sessionStorage.getItem (storageKey)).toContain ('private draft') + }) + + it ('keeps drafts separate across accounts and roles', () => { + const first = renderWithProviders (, { draftScope: '1:admin' }) + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'admin draft' } }) + first.unmount () + + const second = renderWithProviders (, { draftScope: '1:member' }) + expect (screen.getByLabelText ('title')).toHaveValue ('original') + second.unmount () + + renderWithProviders (, { draftScope: '2:admin' }) + expect (screen.getByLabelText ('title')).toHaveValue ('original') + }) + + it ('removes the draft after all changes are reverted', () => { + renderWithProviders () + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'original' } }) + expect (sessionStorage.getItem (storageKey)).toBeNull () + const event = new Event ('beforeunload', { cancelable: true }) + window.dispatchEvent (event) + expect (event.defaultPrevented).toBe (false) + }) + + it.each (['{', 'null', '{"title":12,"file":null}']) ( + 'ignores corrupt or incompatible storage: %s', raw => { + sessionStorage.setItem (storageKey, raw) + renderWithProviders () + expect (screen.getByLabelText ('title')).toHaveValue ('original') + expect (sessionStorage.getItem (storageKey)).toBeNull () + }) + + it ('continues guarding input when browser storage is unavailable', async () => { + vi.spyOn (Storage.prototype, 'getItem').mockImplementation (() => { + throw new DOMException ('disabled') + }) + vi.spyOn (Storage.prototype, 'setItem').mockImplementation (() => { + throw new DOMException ('quota') + }) + renderWithProviders () + fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } }) + fireEvent.click (screen.getByText ('leave')) + expect (await screen.findByRole ('dialog')).toBeInTheDocument () + }) + + it ('restores selected file contents as well as text', async () => { + const first = renderWithProviders () + const file = new File (['image data'], 'draft.png', { type: 'image/png' }) + fireEvent.change (screen.getByLabelText ('file'), { target: { files: [file] } }) + await waitFor (() => { + expect (sessionStorage.getItem (storageKey)).toContain ('draft.png') + }) + first.unmount () + + renderWithProviders () + expect (screen.getByLabelText ('filename')).toHaveTextContent ('draft.png') + expect (JSON.parse (sessionStorage.getItem (storageKey)!).file.data) + .toBe ('data:image/png;base64,aW1hZ2UgZGF0YQ==') + }) + + it ('does not recreate discarded drafts when a pending file read finishes', async () => { + const pending = { reader: null as FileReader | null } + vi.spyOn (FileReader.prototype, 'readAsDataURL').mockImplementation (function (this: FileReader) { + pending.reader = this + }) + renderWithProviders () + fireEvent.change (screen.getByLabelText ('file'), { + target: { files: [new File (['data'], 'pending.png')] } }) + expect (pending.reader).not.toBeNull () + + fireEvent (window, new Event ('pagehide')) + const reader = pending.reader! + Object.defineProperty (reader, 'result', { value: 'data:;base64,ZGF0YQ==' }) + await act (async () => { + reader.dispatchEvent (new ProgressEvent ('load')) + }) + expect (sessionStorage.getItem (storageKey)).toBeNull () + }) + + it ('keeps browser drafts out of the server render and initial hydration markup', () => { + sessionStorage.setItem (storageKey, JSON.stringify ({ title: 'browser draft', file: null })) + const router = createMemoryRouter ([{ path: '*', element: ( + + + + + ) }]) + const html = renderToString () + expect (html).toContain ('original') + expect (html).not.toContain ('browser draft') + expect (sessionStorage.getItem (storageKey)).toContain ('browser draft') + }) +}) diff --git a/frontend/src/lib/useSessionDraft.ts b/frontend/src/lib/useSessionDraft.ts new file mode 100644 index 0000000..5805d39 --- /dev/null +++ b/frontend/src/lib/useSessionDraft.ts @@ -0,0 +1,180 @@ +import { useCallback, useEffect, useRef, useState } from 'react' + +import { readSessionStorage, removeSessionStorage, writeSessionStorage } + from '@/lib/sessionStorage' +import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard' + +import type { SetStateAction } from 'react' + +const fileIds = new WeakMap () +let fileSequence = 0 + +const serialiseIdentity = (value: unknown): string => + JSON.stringify (value, (_key, item) => { + if (typeof File === 'undefined' || !(item instanceof File)) return item + if (!fileIds.has (item)) fileIds.set (item, ++fileSequence) + return { fileId: fileIds.get (item) } + }) + +const serialiseDraft = (value: unknown): string | Promise => { + const files: File[] = [] + const raw = JSON.stringify (value, (_key, item) => { + if (typeof File === 'undefined' || !(item instanceof File)) return item + return { sessionDraftFileId: files.push (item) - 1 } + }) + if (files.length === 0) return raw + return Promise.all (files.map (file => new Promise ((resolve, reject) => { + const reader = new FileReader () + reader.onerror = () => reject (reader.error) + reader.onload = () => resolve ({ + sessionDraftFileFlg: true, name: file.name, type: file.type, + lastModified: file.lastModified, data: reader.result }) + reader.readAsDataURL (file) + }))).then (values => JSON.stringify (JSON.parse (raw, (_key, item) => + item?.sessionDraftFileId == null ? item : values[item.sessionDraftFileId]))) +} + +const parseDraft = (raw: string): unknown => + JSON.parse (raw, (_key, value) => { + if (value?.sessionDraftFileFlg !== true) return value + if (typeof value.name !== 'string' || typeof value.type !== 'string' + || typeof value.lastModified !== 'number' || typeof value.data !== 'string') + throw new Error ('Invalid draft file') + const data = atob (value.data.slice (value.data.indexOf (',') + 1)) + const bytes = Uint8Array.from (data, character => character.charCodeAt (0)) + return new File ([bytes], value.name, { + type: value.type, lastModified: value.lastModified }) + }) + +const validDraft = (value: unknown, initial: unknown, nullable = false): boolean => { + if (nullable && value == null && typeof initial !== 'object') return true + if (initial == null) + return value == null || typeof value === 'string' || typeof value === 'number' + || (typeof File !== 'undefined' && value instanceof File) + if (Array.isArray (initial)) + return Array.isArray (value) + && (initial.length === 0 || value.every (item => validDraft (item, initial[0], true))) + if (typeof initial !== 'object') return typeof value === typeof initial + if (value == null || typeof value !== 'object' || Array.isArray (value)) return false + return Object.entries (initial).every (([key, item]) => + validDraft ((value as Record)[key], item, nullable)) +} + +type DraftEntry = { + key: string + initial: string + baseline: T + value: T } + +// Server data supplies the baseline; background refetches never replace dirty input. +export const useSessionDraft = ( + name: string, + initial: T, + active = true, + difference?: (value: T, baseline: T) => boolean, +) => { + const { draftScope, allowNextNavigation, confirmNavigation } = useUnsavedChangesGuard () + const key = `session-draft:1:${draftScope}:${name}` + const available = active && draftScope !== '' + const identity = serialiseIdentity (initial) + const [entry, setEntry] = useState | null> (null) + const revision = useRef (0) + const current = useRef ({ key, initial, identity, entry }) + current.current = { key, initial, identity, entry } + const ready = available && entry?.key === key + const pristine = entry == null + || serialiseIdentity (entry.value) === serialiseIdentity (entry.baseline) + const draft = ready && !(pristine && entry.initial !== identity) ? entry.value : initial + const dirty = ready && (difference?.(draft, entry.baseline) ?? !pristine) + + useEffect (() => { + if (!available) return + const { initial } = current.current + setEntry (previous => { + if (previous?.key === key) + { + if (previous.initial === identity) return previous + const clean = serialiseIdentity (previous.value) === serialiseIdentity (previous.baseline) + return { key, initial: identity, baseline: initial, + value: clean ? initial : previous.value } + } + const raw = readSessionStorage (key) + try + { + const value: unknown = raw == null ? initial : parseDraft (raw) + if (validDraft (value, initial)) + return { key, initial: identity, baseline: initial, value: value as T } + } + catch + { + // Corrupt or obsolete browser data must not break the editor. + } + removeSessionStorage (key) + return { key, initial: identity, baseline: initial, value: initial } + }) + }, [available, key, identity]) + + useEffect (() => { + if (!ready) return + const sequence = ++revision.current + if (pristine) + { + removeSessionStorage (key) + return + } + const write = (value: string) => { + if (!writeSessionStorage (key, value)) removeSessionStorage (key) + } + const contents = serialiseDraft (draft) + if (typeof contents === 'string') + write (contents) + else + void contents.then (value => { + if (revision.current === sequence) write (value) + }).catch (() => { + // File failures leave the live input and navigation guard intact. + }) + }, [pristine, draft, key, ready]) + + const setDraft = useCallback ((value: SetStateAction) => { + const source = current.current + setEntry (previous => { + const present = previous?.key === source.key ? previous.value : source.initial + const next = + typeof value === 'function' + ? (value as (current: T) => T) (present) + : value + return { key: source.key, initial: source.identity, + baseline: previous?.key === source.key ? previous.baseline : source.initial, + value: next } + }) + }, []) + + const setField = useCallback ( ( + field: Key, + value: SetStateAction, + ) => setDraft (previous => ({ ...previous, + [field]: + typeof value === 'function' + ? (value as (current: T[Key]) => T[Key]) (previous[field]) + : value })), [setDraft]) + + const clearDraft = useCallback ((value?: T) => { + const source = current.current + ++revision.current + removeSessionStorage (source.key) + const present = source.entry?.key === source.key ? source.entry.value : source.initial + const next = value ?? present + setEntry ({ key: source.key, initial: source.identity, baseline: next, value: next }) + }, []) + + const discardDraft = useCallback (() => { + const source = current.current + clearDraft (source.entry?.key === source.key ? source.entry.baseline : source.initial) + }, [clearDraft]) + + useUnsavedChangesGuard ({ dirty, onDiscard: discardDraft }) + + return { draft, setDraft, setField, clearDraft, discardDraft, dirty, + ready, allowNextNavigation, confirmNavigation } +} diff --git a/frontend/src/lib/useUnsavedChangesGuard.test.tsx b/frontend/src/lib/useUnsavedChangesGuard.test.tsx index 8c945ba..5ec603b 100644 --- a/frontend/src/lib/useUnsavedChangesGuard.test.tsx +++ b/frontend/src/lib/useUnsavedChangesGuard.test.tsx @@ -6,11 +6,14 @@ import { describe, expect, it, vi } from 'vitest' import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard' import { renderWithProviders } from '@/test/render' -const GuardHarness = () => { +const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => { const [dirty, setDirty] = useState (true) const location = useLocation () const navigate = useNavigate () - const discard = vi.fn (() => setDirty (false)) + const discard = () => { + onDiscard?.() + setDirty (false) + } const { allowNextNavigation } = useUnsavedChangesGuard ({ dirty, onDiscard: discard }) @@ -31,6 +34,18 @@ const GuardHarness = () => { } describe ('useUnsavedChangesGuard', () => { + it ('uses the current discard callback while dirty state stays unchanged', async () => { + const original = vi.fn () + const current = vi.fn () + const view = renderWithProviders () + view.rerender () + fireEvent.click (screen.getByRole ('button', { name: 'move' })) + fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' })) + + await waitFor (() => expect (current).toHaveBeenCalledTimes (1)) + expect (original).not.toHaveBeenCalled () + }) + it ('blocks route changes and resets a cancelled transition', async () => { renderWithProviders (, { route: '/current' }) diff --git a/frontend/src/lib/useUnsavedChangesGuard.tsx b/frontend/src/lib/useUnsavedChangesGuard.tsx index 306e4af..c313e60 100644 --- a/frontend/src/lib/useUnsavedChangesGuard.tsx +++ b/frontend/src/lib/useUnsavedChangesGuard.tsx @@ -23,17 +23,20 @@ type UseUnsavedChangesGuardOptions = { onDiscard?: () => void | Promise } type UnsavedChangesGuardContextValue = { + draftScope: string hasUnsavedChanges: boolean registerUnsavedChangesSource: ( source: UnsavedChangesSource, ) => () => void - allowNextNavigation: () => void } + allowNextNavigation: () => void + confirmNavigation: () => Promise } const UnsavedChangesGuardContext = createContext (null) -export const UnsavedChangesGuardProvider: FC = ({ children }) => { +export const UnsavedChangesGuardProvider: FC> = ({ children, draftScope = 'anonymous' }) => { const dialogue = useDialogue () const { label } = useUITranslation ('settings') const sourcesRef = useRef (new Map ()) @@ -117,6 +120,12 @@ export const UnsavedChangesGuardProvider: FC = ({ children }) } }, [dialogue, hasUnsavedChanges, label]) + const confirmNavigation = useCallback (async (): Promise => { + if (!(await confirmDiscardChanges ())) return false + await Promise.all (dirtySources.map (source => source.discard ())) + return true + }, [confirmDiscardChanges, dirtySources]) + useEffect (() => { if (blocker.state !== 'blocked' || handlingBlockedTransitionRef.current) return @@ -125,33 +134,24 @@ export const UnsavedChangesGuardProvider: FC = ({ children }) void (async () => { try { - const confirmed = await confirmDiscardChanges () - if (!(confirmed)) - { - blocker.reset () - return - } - - let discardResults: Array> - try - { - discardResults = dirtySources.map (source => source.discard ()) - } - catch - { + const confirmed = await confirmNavigation () + if (!confirmed) { blocker.reset () return - } + } - blocker.proceed () - await Promise.allSettled (discardResults) + blocker.proceed () + } + catch + { + blocker.reset () } finally { handlingBlockedTransitionRef.current = false } }) () - }, [blocker, confirmDiscardChanges, dirtySources]) + }, [blocker, confirmNavigation]) useEffect (() => { if (!(hasUnsavedChanges)) @@ -162,21 +162,30 @@ export const UnsavedChangesGuardProvider: FC = ({ children }) event.returnValue = '' } + const handlePageHide = () => { + for (const source of sourcesRef.current.values ()) + if (source.dirty) void source.discard () + } + window.addEventListener ('beforeunload', handleBeforeUnload) + window.addEventListener ('pagehide', handlePageHide) return () => { window.removeEventListener ('beforeunload', handleBeforeUnload) + window.removeEventListener ('pagehide', handlePageHide) } }, [hasUnsavedChanges]) const value = useMemo (() => ({ + draftScope, hasUnsavedChanges, registerUnsavedChangesSource, allowNextNavigation, - }), [ + confirmNavigation }), [ allowNextNavigation, + confirmNavigation, + draftScope, hasUnsavedChanges, - registerUnsavedChangesSource, - ]) + registerUnsavedChangesSource]) return ( @@ -194,15 +203,17 @@ export const useUnsavedChangesGuard = ( throw new Error ('UnsavedChangesGuardProvider が必要です.') const { registerUnsavedChangesSource } = context + const source = useRef (options) + source.current = options + const active = options != null useEffect (() => { - if (options == null) - return + if (!active) return return registerUnsavedChangesSource ({ - dirty: options.dirty, - discard: options.onDiscard ?? (() => undefined) }) - }, [options?.dirty, options?.onDiscard, registerUnsavedChangesSource]) + dirty: source.current?.dirty ?? false, + discard: () => source.current?.onDiscard?.() }) + }, [active, options?.dirty, registerUnsavedChangesSource]) return context } diff --git a/frontend/src/pages/GekanatorPage.tsx b/frontend/src/pages/GekanatorPage.tsx index e37d7f3..87d8de7 100644 --- a/frontend/src/pages/GekanatorPage.tsx +++ b/frontend/src/pages/GekanatorPage.tsx @@ -2,6 +2,7 @@ import { animate, motion, useMotionTemplate, useMotionValue } from 'framer-motio import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react' +import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard' import { useLocale } from '@/lib/useLocale' import PrefetchLink from '@/components/PrefetchLink' import MainArea from '@/components/layout/MainArea' @@ -4190,6 +4191,14 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => { setHistory ([]) } + useUnsavedChangesGuard ({ + dirty: !restorePromptVisible && ( + (!saved && answers.length > 0) + || questionSuggestion.trim () !== '' + || questionSuggestionSelectedId != null + || (extraQuestionState !== 'saved' && Object.keys (extraQuestionAnswers).length > 0)), + onDiscard: reset }) + const continueStoredGame = () => { setRestorePromptVisible (false) setPhase (storedGame?.phase ?? 'question') diff --git a/frontend/src/pages/deerjikists/DeerjikistDetailPage.tsx b/frontend/src/pages/deerjikists/DeerjikistDetailPage.tsx index 489c486..d408457 100644 --- a/frontend/src/pages/deerjikists/DeerjikistDetailPage.tsx +++ b/frontend/src/pages/deerjikists/DeerjikistDetailPage.tsx @@ -2,6 +2,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query' import { useEffect, useMemo, useState } from 'react' import { useParams } from 'react-router-dom' +import { useSessionDraft } from '@/lib/useSessionDraft' import { useLocale } from '@/lib/useLocale' import { useUITranslation } from '@/lib/useUITranslation' import TagLink from '@/components/TagLink' @@ -38,8 +39,9 @@ const DeerjikistDetailPage: FC = () => { const tag = qData?.tag const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData]) - const [data, setData] = - useState<(Omit & { platform: Platform | null })[]> (deerjikists) + const { draft: data, setDraft: setData, clearDraft } = useSessionDraft< + (Omit & { platform: Platform | null })[]> ( + `deerjikists:${tagId}:${locale}`, deerjikists, tag != null) const [disabled, setDisabled] = useState (tag == null) const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = useValidationErrors () @@ -54,7 +56,7 @@ const DeerjikistDetailPage: FC = () => { { setDisabled (true) - setData (await apiPut (`/tags/${ id }/deerjikists`, data, { locale })) + clearDraft (await apiPut (`/tags/${ id }/deerjikists`, data, { locale })) qc.invalidateQueries ({ queryKey: tagsKeys.root }) toast ({ description: label ('messages.updated') }) @@ -78,7 +80,6 @@ const DeerjikistDetailPage: FC = () => { return } - setData (deerjikists) setDisabled (false) }, [tag, deerjikists]) diff --git a/frontend/src/pages/materials/MaterialDetailPage.tsx b/frontend/src/pages/materials/MaterialDetailPage.tsx index 957d2c8..456e94a 100644 --- a/frontend/src/pages/materials/MaterialDetailPage.tsx +++ b/frontend/src/pages/materials/MaterialDetailPage.tsx @@ -2,6 +2,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useEffect, useState } from 'react' import { useParams } from 'react-router-dom' +import { useSessionDraft } from '@/lib/useSessionDraft' import { useLocale } from '@/lib/useLocale' import TagLink from '@/components/TagLink' import WikiBody from '@/components/WikiBody' @@ -40,12 +41,23 @@ const MaterialDetailPage: FC = () => { queryFn: () => fetchMaterial (id ?? '', locale), enabled: id != null }) - const [exportPath, setExportPath] = useState (material?.exportPaths.legacyDrive ?? '') - const [file, setFile] = useState (null) - const [filePreview, setFilePreview] = useState ( - material?.contentType != null ? material.file ?? '' : '') - const [tag, setTag] = useState (material?.tag?.name ?? '') - const [url, setURL] = useState (material?.url ?? '') + const { draft, setField, clearDraft, confirmNavigation } = + useSessionDraft (`material:${id}:${locale}`, { + tag: material?.tag?.name ?? '', url: material?.url ?? '', + exportPath: material?.exportPaths.legacyDrive ?? '', file: null as File | null }, + material != null) + const { tag, url, exportPath, file } = draft + const [filePreview, setFilePreview] = useState ('') + useEffect (() => { + const preview = + file == null + ? (material?.contentType != null ? material.file ?? '' : '') + : URL.createObjectURL (file) + setFilePreview (preview) + return () => { + if (file != null) URL.revokeObjectURL (preview) + } + }, [file, material?.contentType, material?.file]) const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = useValidationErrors () @@ -53,20 +65,6 @@ const MaterialDetailPage: FC = () => { ? material.tag?.name ?? message ('unnamed', { id: material.id }).text : '' - useEffect (() => { - if (!(material)) - return - - setTag (material.tag?.name ?? '') - setURL (material.url ?? '') - setExportPath (material.exportPaths.legacyDrive ?? '') - if (material.file && material.contentType) - { - setFilePreview (material.file) - setFile (null) - } - }, [material]) - const invalidateMaterialQueries = async () => { await qc.invalidateQueries ({ queryKey: materialsKeys.root }) } @@ -85,6 +83,8 @@ const MaterialDetailPage: FC = () => { return await updateMaterial (id ?? '', formData, locale) }, onSuccess: async data => { + clearDraft ({ tag: data.tag?.name ?? '', url: data.url ?? '', + exportPath: data.exportPaths.legacyDrive ?? '', file: null }) qc.setQueryData (materialsKeys.show (id ?? '', locale), data) await invalidateMaterialQueries () toast ({ title: label ('updated') }) @@ -133,7 +133,7 @@ const MaterialDetailPage: FC = () => { || (/audio\/.*/.test (material.contentType) && (