Merge branch 'main' into feature/149

このコミットが含まれているのは:
2026-11-23 03:53:45 +09:00
コミット 35da904296
46個のファイルの変更、4223行の追加、275行の削除
+12
ファイルの表示
@@ -39,6 +39,18 @@ describe ('TagDetailSidebar', () => {
vi.clearAllMocks ()
})
it ('inherits the sidebar width saved by the post list', () => {
localStorage.setItem ('sidebar:posts-index-tags:left:width', '320')
const { container } = renderWithProviders (
<TagDetailSidebar post={buildPost ()}/>)
const sidebar = container.querySelector<HTMLElement> (
'[style*="--sidebar-width"]')
expect (sidebar).toBeInTheDocument ()
expect (sidebar?.style.getPropertyValue ('--sidebar-width')).toBe ('320px')
})
it ('keeps internal and external tags with the same numeric id in flat mode', () => {
setClientTagRelationDisplayMode ('flat')
+1 -1
ファイルの表示
@@ -378,7 +378,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
}, [baseTags])
return (
<SidebarComponent sidebarKey="post-detail-tags" className={className}>
<SidebarComponent sidebarKey="posts-index-tags" className={className}>
<TagSearch/>
<DndContext
sensors={sensors}
+10
ファイルの表示
@@ -70,6 +70,16 @@ describe ('SidebarComponent', () => {
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 () => {
localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
const onWidthChange = vi.fn ()
+1 -1
ファイルの表示
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
</style>
</Helmet>
<div className="h-full overflow-y-auto p-4 sidebar">
<div className="h-full md:overflow-y-auto p-4 sidebar">
{children}
</div>
+9 -2
ファイルの表示
@@ -35,6 +35,10 @@ const renderPage = () =>
describe ('TagDetailPage', () => {
beforeEach (() => {
vi.clearAllMocks ()
tagsApi.fetchTag.mockReset ()
api.apiPut.mockReset ()
api.isApiError.mockReset ()
toastApi.toast.mockReset ()
api.isApiError.mockReturnValue (false)
})
@@ -51,8 +55,11 @@ describe ('TagDetailPage', () => {
})
it ('submits edited tag fields', async () => {
tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
tagsApi.fetchTag
.mockResolvedValue (updatedTag)
.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
api.apiPut.mockResolvedValueOnce (updatedTag)
renderPage ()