コミットを比較

..
2 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker 5303eaa31a AI: address review on PR #463 2026-11-12 19:39:55 +09:00
Codex Night Worker f39aa04e9a AI: address issue #448 2026-11-12 19:36:05 +09:00
10個のファイルの変更、98行の追加、43行の削除
+44
ファイルの表示
@@ -1,9 +1,25 @@
import { screen } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest' import { beforeEach, describe, expect, it, vi } from 'vitest'
import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow' import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow'
import { buildTag } from '@/test/factories' import { buildTag } from '@/test/factories'
import { renderWithProviders } from '@/test/render' import { renderWithProviders } from '@/test/render'
import type { CSSProperties, ReactNode } from 'react'
vi.mock ('framer-motion', async importOriginal => {
const original = await importOriginal<typeof import ('framer-motion')> ()
return {
...original,
motion: {
...original.motion,
div: ({ children, style, layoutId }: {
children?: ReactNode
style?: CSSProperties
layoutId?: string }) => (
<div style={style} data-layout-id={layoutId}>{children}</div>) } }
})
const dndKit = vi.hoisted (() => ({ const dndKit = vi.hoisted (() => ({
useDraggable: vi.fn (), useDraggable: vi.fn (),
useDroppable: vi.fn (), useDroppable: vi.fn (),
@@ -97,4 +113,32 @@ describe ('DraggableDroppableTagRow', () => {
}), }),
) )
}) })
it.each ([false, true]) (
'separates same-id internal and external animation identities (sp=%s)',
sp => {
const internal = buildTag ({ id: 7, name: 'internal_collision' })
const external = buildTag ({
id: 7, name: 'nico:external_collision', category: 'nico' })
renderWithProviders (
<>
{[internal, external].map (item => (
<DraggableDroppableTagRow
key={item.category}
tag={item}
nestLevel={0}
pathKey={`cat-${ item.category }-7`}
suppressClickRef={{ current: false }}
sp={sp}/>))}
</>)
const prefix = sp ? 'tag-sp-' : 'tag-'
for (const item of [internal, external])
{
expect (screen.getByRole ('link', { name: item.name })
.closest ('[data-layout-id]')).toHaveAttribute (
'data-layout-id', `${ prefix }${ item.category }-7`)
}
})
}) })
+1 -1
ファイルの表示
@@ -137,7 +137,7 @@ const DraggableDroppableTagRow: FC<Props> = ({
transition={{ layout: layoutTransition }} transition={{ layout: layoutTransition }}
layoutId={animationMode === 'off' layoutId={animationMode === 'off'
? undefined ? undefined
: `tag-${ sp ? 'sp-' : '' }${ tag.id }`}> : `tag-${ sp ? 'sp-' : '' }${ tag.category }-${ tag.id }`}>
<TagLink tag={tag} nestLevel={nestLevel}/> <TagLink tag={tag} nestLevel={nestLevel}/>
</motion.div>)} </motion.div>)}
</div>) </div>)
-15
ファイルの表示
@@ -153,21 +153,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
setDisabled (true) setDisabled (true)
try try
{ {
const titleMissing = !title?.trim ()
const thumbnailMissing =
!titleMissing
&& !(post.thumbnail?.trim () || post.thumbnailBase?.trim ())
if ((titleMissing || thumbnailMissing)
&& !(await dialogue.confirm ({
title: titleMissing
? label ('edit.titleMissingConfirmation')
: label ('edit.thumbnailMissingConfirmation'),
confirmText: label ('shared:actions.update'),
cancelText: label ('shared:actions.cancel'),
closeLabel: label ('settings:actions.close') })))
return
await update ({ id: post.id, title, tags, parentPostIds, await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null, duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore }, originalCreatedFrom, originalCreatedBefore },
+47
ファイルの表示
@@ -0,0 +1,47 @@
import { screen } from '@testing-library/react'
import { describe, expect, it, vi } from 'vitest'
import TagSidebar from '@/components/TagSidebar'
import { buildPost, buildTag } from '@/test/factories'
import { renderWithProviders } from '@/test/render'
import type { ReactNode } from 'react'
vi.mock ('@/components/TagSearch', () => ({ default: () => null }))
vi.mock ('@/components/layout/SidebarComponent', () => ({
default: ({ children }: { children: ReactNode }) => <>{children}</> }))
vi.mock ('framer-motion', async importOriginal => {
const original = await importOriginal<typeof import ('framer-motion')> ()
return {
...original,
motion: {
...original.motion,
div: ({ children, layoutId }: {
children?: ReactNode
layoutId?: string }) => (
<div data-layout-id={layoutId}>{children}</div>) } }
})
describe ('TagSidebar', () => {
it ('keeps same-id internal and external tags with distinct identities', () => {
const errors = vi.spyOn (console, 'error').mockImplementation (() => {})
const internal = buildTag ({ id: 7, name: 'internal_collision' })
const external = buildTag ({
id: 7, name: 'nico:external_collision', category: 'nico' })
renderWithProviders (
<TagSidebar posts={[buildPost ({ tags: [internal, external] })]}/>)
for (const item of [internal, external])
{
const link = screen.getByRole ('link', { name: item.name })
expect (link).toBeInTheDocument ()
expect (link.closest ('[data-layout-id]')).toHaveAttribute (
'data-layout-id', `tag-${ item.category }-7`)
}
expect (errors.mock.calls.filter (args =>
args.some (value => String (value).includes ('same key')))).toEqual ([])
})
})
+3 -2
ファイルの表示
@@ -84,7 +84,8 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
<ul> <ul>
{CATEGORIES.flatMap (cat => cat in tags ? ( {CATEGORIES.flatMap (cat => cat in tags ? (
tags[cat].map (tag => ( tags[cat].map (tag => (
<li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden"> <li key={`${ cat }-${ tag.id }`}
className="mb-1 min-w-0 max-w-full overflow-hidden">
{animationsOff {animationsOff
? ( ? (
<div className="flex min-w-0 max-w-full items-baseline overflow-hidden"> <div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
@@ -94,7 +95,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
<motion.div <motion.div
className="flex min-w-0 max-w-full items-baseline overflow-hidden" className="flex min-w-0 max-w-full items-baseline overflow-hidden"
transition={{ layout: layoutTransition }} transition={{ layout: layoutTransition }}
layoutId={`tag-${ tag.id }`}> layoutId={`tag-${ cat }-${ tag.id }`}>
<TagLink tag={tag} onClick={onClick}/> <TagLink tag={tag} onClick={onClick}/>
</motion.div>)} </motion.div>)}
</li>))) : [])} </li>))) : [])}
-10
ファイルの表示
@@ -70,16 +70,6 @@ describe ('SidebarComponent', () => {
vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true) vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
}) })
it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
renderSidebar ()
// jsdom has no layout; guard the responsive classes responsible for clipping.
const sidebar = screen.getByText ('Sidebar body')
expect (sidebar).not.toHaveClass ('overflow-y-auto')
expect (sidebar).toHaveClass ('md:overflow-y-auto')
})
it ('uses maxWidth without applying the container main-width reserve twice', async () => { it ('uses maxWidth without applying the container main-width reserve twice', async () => {
localStorage.setItem ('sidebar:test-sidebar:left:width', '700') localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
const onWidthChange = vi.fn () const onWidthChange = vi.fn ()
+1 -1
ファイルの表示
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
</style> </style>
</Helmet> </Helmet>
<div className="h-full md:overflow-y-auto p-4 sidebar"> <div className="h-full overflow-y-auto p-4 sidebar">
{children} {children}
</div> </div>
-3
ファイルの表示
@@ -1,5 +1,4 @@
{ {
"_untranslated": ["edit.titleMissingConfirmation", "edit.thumbnailMissingConfirmation"],
"list": { "list": {
"tagline": "{{brand}}", "tagline": "{{brand}}",
"empty": "ミンタㇻ タ ネン カ イサㇺ", "empty": "ミンタㇻ タ ネン カ イサㇺ",
@@ -32,8 +31,6 @@
"showExternal": "ソイタㇰ ソㇱ アヌカレ" "showExternal": "ソイタㇰ ソㇱ アヌカレ"
}, },
"edit": { "edit": {
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
"thumbnailMissingConfirmation": "サムネールが設定されてゐません.更新しますか?",
"validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……", "validationFailed": "アシㇼ カㇻ カ エアイカㇷ゚……",
"conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!", "conflictTitle": "モㇱマ クㇽ アシㇼ カㇻ ワ アン!",
"conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。", "conflictDescription": "モㇱマ イカㇻ クㇽ エエトコ アシㇼ カㇻ ワ アン。",
-2
ファイルの表示
@@ -22,8 +22,6 @@
"question": "表示しますか?", "showExternal": "外部ページを表示" "question": "表示しますか?", "showExternal": "外部ページを表示"
}, },
"edit": { "edit": {
"titleMissingConfirmation": "タイトルが設定されてゐません.更新しますか?",
"thumbnailMissingConfirmation": "サムネールが設定されてゐません.更新しますか?",
"validationFailed": "更新はできなかったよ……", "validationFailed": "更新はできなかったよ……",
"conflictTitle": "競合が発生しました.", "conflictTitle": "競合が発生しました.",
"conflictDescription": "ほかの耕作員が先に更新してゐます.", "conflictDescription": "ほかの耕作員が先に更新してゐます.",
+2 -9
ファイルの表示
@@ -35,10 +35,6 @@ const renderPage = () =>
describe ('TagDetailPage', () => { describe ('TagDetailPage', () => {
beforeEach (() => { beforeEach (() => {
vi.clearAllMocks () vi.clearAllMocks ()
tagsApi.fetchTag.mockReset ()
api.apiPut.mockReset ()
api.isApiError.mockReset ()
toastApi.toast.mockReset ()
api.isApiError.mockReturnValue (false) api.isApiError.mockReturnValue (false)
}) })
@@ -55,11 +51,8 @@ describe ('TagDetailPage', () => {
}) })
it ('submits edited tag fields', async () => { it ('submits edited tag fields', async () => {
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] }) tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
tagsApi.fetchTag api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
.mockResolvedValue (updatedTag)
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
api.apiPut.mockResolvedValueOnce (updatedTag)
renderPage () renderPage ()