コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
1627450835 | ||
|
|
ab0e28576d |
@@ -1,25 +1,9 @@
|
|||||||
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 (),
|
||||||
@@ -113,32 +97,4 @@ 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`)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -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.category }-${ tag.id }`}>
|
: `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
<TagLink tag={tag} nestLevel={nestLevel}/>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
</div>)
|
</div>)
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
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 ([])
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -84,8 +84,7 @@ 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={`${ cat }-${ tag.id }`}
|
<li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
|
||||||
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">
|
||||||
@@ -95,7 +94,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-${ cat }-${ tag.id }`}>
|
layoutId={`tag-${ tag.id }`}>
|
||||||
<TagLink tag={tag} onClick={onClick}/>
|
<TagLink tag={tag} onClick={onClick}/>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
</li>))) : [])}
|
</li>))) : [])}
|
||||||
|
|||||||
@@ -70,6 +70,16 @@ 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 ()
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
</style>
|
</style>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="h-full overflow-y-auto p-4 sidebar">
|
<div className="h-full md:overflow-y-auto p-4 sidebar">
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする