Skip to content

fix(web): name conversation menu triggers #40253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lyzno1 wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −33
Draft

fix(web): name conversation menu triggers #40253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions oxlint-suppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,14 +806,6 @@
"count": 3
}
},
"web/app/components/base/chat/chat-with-history/sidebar/__tests__/operation.spec.tsx": {
"jsx_a11y/click-events-have-key-events": {
"count": 2
},
"jsx_a11y/no-static-element-interactions": {
"count": 2
}
},
"web/app/components/base/chat/chat-with-history/sidebar/item.tsx": {
"jsx_a11y/click-events-have-key-events": {
"count": 2
Expand Down
47 changes: 22 additions & 25 deletions web/app/components/base/chat/chat-with-history/sidebar/__tests__/operation.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
import Operation from '../operation'

describe('Operation', () => {
const getTrigger = () => screen.getByRole('button', { name: 'common.operation.more' })
const defaultProps = {
isActive: false,
isItemHovering: false,
Expand All @@ -22,29 +23,29 @@ describe('Operation', () => {

it('should render more icon button', () => {
render(<Operation {...defaultProps} />)
expect(screen.getByRole('button')).toBeInTheDocument()
expect(getTrigger()).toBeInTheDocument()
})

it('should toggle dropdown when clicked', async () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} isItemHovering={true} />)

const trigger = screen.getByRole('button')
const trigger = getTrigger()
await user.click(trigger)

expect(screen.getByText('explore.sidebar.action.pin')).toBeInTheDocument()
})

it('should apply active state to ActionButton', () => {
render(<Operation {...defaultProps} isActive={true} />)
expect(screen.getByRole('button')).toBeInTheDocument()
expect(getTrigger()).toBeInTheDocument()
})

it('should call togglePin when pin/unpin is clicked', async () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
await user.click(screen.getByText('explore.sidebar.action.pin'))

expect(defaultProps.togglePin).toHaveBeenCalled()
Expand All @@ -54,15 +55,15 @@ describe('Operation', () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} isPinned={true} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
expect(screen.getByText('explore.sidebar.action.unpin')).toBeInTheDocument()
})

it('should call onRenameConversation when rename is clicked', async () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
await user.click(screen.getByText('explore.sidebar.action.rename'))

await waitFor(() => {
Expand All @@ -74,7 +75,7 @@ describe('Operation', () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
await user.click(screen.getByText('explore.sidebar.action.delete'))

await waitFor(() => {
Expand All @@ -86,15 +87,15 @@ describe('Operation', () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} isShowRenameConversation={false} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
expect(screen.queryByText('explore.sidebar.action.rename')).not.toBeInTheDocument()
})

it('should hide rename action when isShowRenameConversation is false', async () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} isShowRenameConversation={false} isShowDelete={false} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
expect(screen.queryByText('explore.sidebar.action.rename')).not.toBeInTheDocument()
expect(screen.queryByText('explore.sidebar.action.delete')).not.toBeInTheDocument()
})
Expand All @@ -103,7 +104,7 @@ describe('Operation', () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} isItemHovering={true} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())

expect(screen.getByText('explore.sidebar.action.pin')).toBeInTheDocument()
})
Expand All @@ -112,7 +113,7 @@ describe('Operation', () => {
const user = userEvent.setup()
const { rerender } = render(<Operation {...defaultProps} isItemHovering={true} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
expect(screen.getByText('explore.sidebar.action.pin')).toBeInTheDocument()

rerender(<Operation {...defaultProps} isItemHovering={false} />)
Expand All @@ -125,7 +126,7 @@ describe('Operation', () => {
it('should keep the trigger mounted while visually hidden', () => {
render(<Operation {...defaultProps} isItemHovering={false} />)

const trigger = screen.getByRole('button')
const trigger = getTrigger()
expect(trigger).toHaveClass('pointer-events-none')
expect(trigger).toHaveClass('opacity-0')
})
Expand All @@ -134,7 +135,7 @@ describe('Operation', () => {
const user = userEvent.setup()
render(<Operation {...defaultProps} onRenameConversation={undefined} />)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
await user.click(screen.getByText('explore.sidebar.action.rename'))

await waitFor(() => {
Expand All @@ -146,13 +147,11 @@ describe('Operation', () => {
const user = userEvent.setup()
const parentClick = vi.fn()

render(
<div onClick={parentClick}>
<Operation {...defaultProps} />
</div>,
)
render(<Operation {...defaultProps} />)
document.body.addEventListener('click', parentClick)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
document.body.removeEventListener('click', parentClick)

expect(parentClick).not.toHaveBeenCalled()
})
Expand All @@ -161,14 +160,12 @@ describe('Operation', () => {
const user = userEvent.setup()
const parentClick = vi.fn()

render(
<div onClick={parentClick}>
<Operation {...defaultProps} isItemHovering={true} />
</div>,
)
render(<Operation {...defaultProps} isItemHovering={true} />)
document.body.addEventListener('click', parentClick)

await user.click(screen.getByRole('button'))
await user.click(getTrigger())
await user.click(screen.getByRole('menu'))
document.body.removeEventListener('click', parentClick)

expect(parentClick).not.toHaveBeenCalled()
})
Expand Down
1 change: 1 addition & 0 deletions web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const Operation: FC<Props> = ({
render={(props, state) => (
<ActionButton
{...props}
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
className={cn(
isItemHovering || state.open
? 'pointer-events-auto opacity-100'
Expand Down