Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

chore: correct ARIA roles and preserve control interactions (#41738)

Joel6208b33e0894
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index ffa19591de1..79a8453cf32 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -715,14 +715,6 @@
"count": 10
}
},
- "web/app/components/base/date-and-time-picker/date-picker/index.tsx": {
- "jsx-a11y/click-events-have-key-events": {
- "count": 1
- },
- "jsx-a11y/no-static-element-interactions": {
- "count": 1
- }
- },
"web/app/components/base/date-and-time-picker/hooks.ts": {
"eslint-react/no-unnecessary-use-prefix": {
"count": 2
diff --git a/packages/dify-ui/src/segmented-control/index.tsx b/packages/dify-ui/src/segmented-control/index.tsx
index 456dd73c2fe..ea1cbdd8c81 100644
--- a/packages/dify-ui/src/segmented-control/index.tsx
+++ b/packages/dify-ui/src/segmented-control/index.tsx
@@ -70,7 +70,6 @@ type SegmentedControlDividerProps = Omit<React.ComponentProps<'span'>, 'classNam
function SegmentedControlDivider({ className, ...props }: SegmentedControlDividerProps) {
return (
<span
- role="presentation"
aria-hidden="true"
className={cn('h-3.5 w-px shrink-0 bg-divider-regular', className)}
{...props}
diff --git a/web/app/components/access-rules-editor/batch-action.tsx b/web/app/components/access-rules-editor/batch-action.tsx
index b01a271a1c0..cb2d529110e 100644
--- a/web/app/components/access-rules-editor/batch-action.tsx
+++ b/web/app/components/access-rules-editor/batch-action.tsx
@@ -46,7 +46,7 @@ export default function AccessRulesBatchAction({
return (
<div className={cn('pointer-events-none flex w-full justify-center', className)}>
<div
- role="toolbar"
+ role="group"
aria-label={t(($) => $['operation.selectCount'], {
ns: 'common',
count: selectedCount,
diff --git a/web/app/components/app/access-point/__tests__/access-point-card.spec.tsx b/web/app/components/app/access-point/__tests__/access-point-card.spec.tsx
index 1d08a65fbb0..d0320ee32ab 100644
--- a/web/app/components/app/access-point/__tests__/access-point-card.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/access-point-card.spec.tsx
@@ -79,7 +79,7 @@ describe('AccessPointCard', () => {
await user.tab()
expect(accessSwitch).toHaveFocus()
- expect(await screen.findByRole('tooltip')).toHaveTextContent('Publish first')
+ expect(await screen.findByText('Publish first')).toBeVisible()
await user.click(accessSwitch)
expect(onEnabledChange).not.toHaveBeenCalled()
diff --git a/web/app/components/app/access-point/__tests__/access-point-url.spec.tsx b/web/app/components/app/access-point/__tests__/access-point-url.spec.tsx
index af58acf2416..b4d60da1a05 100644
--- a/web/app/components/app/access-point/__tests__/access-point-url.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/access-point-url.spec.tsx
@@ -48,7 +48,7 @@ describe('AccessPointUrl', () => {
)
await user.hover(screen.getByRole('button', { name: 'Open' }))
- expect(await screen.findByRole('tooltip')).toHaveTextContent('Publish first')
+ expect(await screen.findByText('Publish first')).toBeVisible()
})
it('shows an unavailable endpoint without replacing it with a loading skeleton', () => {
diff --git a/web/app/components/app/app-publisher/__tests__/environment-tabs.spec.tsx b/web/app/components/app/app-publisher/__tests__/environment-tabs.spec.tsx
index 18b84f117d9..71e8bcc7a6b 100644
--- a/web/app/components/app/app-publisher/__tests__/environment-tabs.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/environment-tabs.spec.tsx
@@ -180,6 +180,6 @@ describe('PublisherEnvironmentTabs', () => {
await user.hover(screen.getByRole('button', { name: longEnvironment.name }))
- expect(await screen.findByRole('tooltip')).toHaveTextContent(longEnvironment.name)
+ expect(await screen.findByText(longEnvironment.name, { selector: '[data-open]' })).toBeVisible()
})
})
diff --git a/web/app/components/app/app-publisher/__tests__/sections.spec.tsx b/web/app/components/app/app-publisher/__tests__/sections.spec.tsx
index d82b4064902..f2dd587ddb6 100644
--- a/web/app/components/app/app-publisher/__tests__/sections.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/sections.spec.tsx
@@ -594,7 +594,9 @@ describe('app-publisher sections', () => {
await user.hover(screen.getByRole('button', { name: /common\.openWebApp\b/ }))
- expect(await screen.findByRole('tooltip')).toHaveTextContent('Open web app unavailable')
+ expect(
+ await screen.findByText('Open web app unavailable', { selector: '[data-open]' }),
+ ).toBeVisible()
})
it('should keep an unavailable action with a tooltip keyboard focusable', async () => {
@@ -622,6 +624,8 @@ describe('app-publisher sections', () => {
expect(action).toHaveFocus()
expect(action).toHaveAttribute('aria-disabled', 'true')
expect(action).toHaveAccessibleDescription('Open web app unavailable')
- expect(await screen.findByRole('tooltip')).toHaveTextContent('Open web app unavailable')
+ expect(
+ await screen.findByText('Open web app unavailable', { selector: '[data-open]' }),
+ ).toBeVisible()
})
})
diff --git a/web/app/components/app/app-publisher/built-in-publisher/actions-section.tsx b/web/app/components/app/app-publisher/built-in-publisher/actions-section.tsx
index 1bc3bb7588a..3e35ae97865 100644
--- a/web/app/components/app/app-publisher/built-in-publisher/actions-section.tsx
+++ b/web/app/components/app/app-publisher/built-in-publisher/actions-section.tsx
@@ -113,7 +113,7 @@ export function PublisherActionsSection({
{t(($) => $['common.openWebApp'], { ns: 'workflow' })}
</SuggestedAction>
</TooltipTrigger>
- <TooltipContent role="tooltip">{disabledFunctionTooltip}</TooltipContent>
+ <TooltipContent>{disabledFunctionTooltip}</TooltipContent>
</Tooltip>
)}
{canViewAccessPoint && (
diff --git a/web/app/components/app/app-publisher/environment-deployment-flow/summary-section.tsx b/web/app/components/app/app-publisher/environment-deployment-flow/summary-section.tsx
index 8d7685a69eb..c5ce3aa5aad 100644
--- a/web/app/components/app/app-publisher/environment-deployment-flow/summary-section.tsx
+++ b/web/app/components/app/app-publisher/environment-deployment-flow/summary-section.tsx
@@ -154,7 +154,7 @@ export function PublisherEnvironmentSummarySection({
</span>
}
/>
- <TooltipContent role="tooltip">{versionsBehindLabel}</TooltipContent>
+ <TooltipContent>{versionsBehindLabel}</TooltipContent>
</Tooltip>
)}
{isLatestVersion && (
diff --git a/web/app/components/app/app-publisher/environment-tabs/environment-button.tsx b/web/app/components/app/app-publisher/environment-tabs/environment-button.tsx
index 6d6a644c901..bacf2235d9d 100644
--- a/web/app/components/app/app-publisher/environment-tabs/environment-button.tsx
+++ b/web/app/components/app/app-publisher/environment-tabs/environment-button.tsx
@@ -33,7 +33,7 @@ export function EnvironmentButton({
</button>
}
/>
- <TooltipContent role="tooltip">{name}</TooltipContent>
+ <TooltipContent>{name}</TooltipContent>
</Tooltip>
)
}
diff --git a/web/app/components/app/app-publisher/environment-tabs/index.tsx b/web/app/components/app/app-publisher/environment-tabs/index.tsx
index eef5c30e32b..ca9ef20e7d0 100644
--- a/web/app/components/app/app-publisher/environment-tabs/index.tsx
+++ b/web/app/components/app/app-publisher/environment-tabs/index.tsx
@@ -144,9 +144,7 @@ export function PublisherEnvironmentTabs({
<TooltipTrigger
render={<span className="min-w-0 truncate">{triggerLabel}</span>}
/>
- <TooltipContent role="tooltip">
- {selectedOverflowEnvironment?.name}
- </TooltipContent>
+ <TooltipContent>{selectedOverflowEnvironment?.name}</TooltipContent>
</Tooltip>
<span aria-hidden className="i-ri-arrow-down-s-line size-3.5 shrink-0" />
</button>
diff --git a/web/app/components/base/access-point/card.tsx b/web/app/components/base/access-point/card.tsx
index fcc9e2f65a1..aaf5e13277b 100644
--- a/web/app/components/base/access-point/card.tsx
+++ b/web/app/components/base/access-point/card.tsx
@@ -117,7 +117,7 @@ export function AccessPointCard({
(hasSwitchDisabledReason ? (
<Tooltip>
<TooltipTrigger render={switchControl} />
- <TooltipContent role="tooltip">{switchDisabledReason}</TooltipContent>
+ <TooltipContent>{switchDisabledReason}</TooltipContent>
</Tooltip>
) : (
switchControl
diff --git a/web/app/components/base/access-point/url.tsx b/web/app/components/base/access-point/url.tsx
index 678946d64bc..837ac521699 100644
--- a/web/app/components/base/access-point/url.tsx
+++ b/web/app/components/base/access-point/url.tsx
@@ -77,7 +77,7 @@ export function AccessPointUrl({
const disabledOpenAction = openDisabledReason ? (
<Tooltip>
<TooltipTrigger render={disabledOpenButton} />
- <TooltipContent role="tooltip">{openDisabledReason}</TooltipContent>
+ <TooltipContent>{openDisabledReason}</TooltipContent>
</Tooltip>
) : (
disabledOpenButton
diff --git a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.browser.spec.tsx b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.browser.spec.tsx
new file mode 100644
index 00000000000..14a2c870049
--- /dev/null
+++ b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.browser.spec.tsx
@@ -0,0 +1,30 @@
+import { userEvent } from 'vite-plus/test/browser'
+import { render } from 'vitest-browser-react'
+import dayjs from '../../utils/dayjs'
+import DatePicker from '../index'
+
+describe('DatePicker browser interactions', () => {
+ it('closes when focus moves backward past the trigger', async () => {
+ // Chromium owns the native focus event order used by Base UI's focus guards.
+ const screen = await render(
+ <>
+ <button type="button">Before picker</button>
+ <DatePicker value={dayjs('2024-06-15')} onChange={() => {}} onClear={() => {}} />
+ </>,
+ )
+
+ const trigger = screen.getByRole('button', { name: /time.defaultPlaceholder/ })
+ await trigger.click()
+ await expect.element(screen.getByRole('dialog')).toBeVisible()
+
+ await userEvent.tab({ shift: true })
+
+ expect(trigger.element()).toHaveFocus()
+ await expect.element(screen.getByRole('dialog')).toBeVisible()
+
+ await userEvent.tab({ shift: true })
+
+ expect(screen.getByRole('button', { name: 'Before picker' }).element()).toHaveFocus()
+ await expect.element(screen.getByRole('dialog')).not.toBeInTheDocument()
+ })
+})
diff --git a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
index 5f7b5fc1233..4500d4c1ae8 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
@@ -17,9 +17,12 @@ const createDatePickerProps = (overrides: Partial<DatePickerProps> = {}): DatePi
...overrides,
})
+const getDateTrigger = () =>
+ screen.getByRole('button', { name: /^(time.defaultPlaceholder|Select date)/ })
+
// Helper to open the picker
const openPicker = () => {
- const input = screen.getByRole('textbox')
+ const input = getDateTrigger()
fireEvent.click(input)
}
@@ -34,14 +37,14 @@ describe('DatePicker', () => {
const props = createDatePickerProps()
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+ expect(getDateTrigger())!.toBeInTheDocument()
})
it('should render with custom placeholder', () => {
const props = createDatePickerProps({ placeholder: 'Select date' })
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox'))!.toHaveAttribute('placeholder', 'Select date')
+ expect(getDateTrigger())!.toHaveTextContent('Select date')
})
it('should display formatted date value when value is provided', () => {
@@ -49,14 +52,33 @@ describe('DatePicker', () => {
const props = createDatePickerProps({ value })
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox').getAttribute('value')).not.toBe('')
+ expect(getDateTrigger()).not.toHaveTextContent('time.defaultPlaceholder')
+ })
+
+ it('should keep the accessible name in sync with the displayed draft date', async () => {
+ const user = userEvent.setup()
+ const props = createDatePickerProps({
+ value: dayjs('2024-06-15'),
+ placeholder: 'Select date',
+ needTimePicker: false,
+ })
+ render(<DatePicker {...props} />)
+
+ const trigger = getDateTrigger()
+ const initialText = trigger.textContent
+
+ await user.click(trigger)
+ await user.click(screen.getByRole('button', { name: '20' }))
+
+ expect(trigger.textContent).not.toBe(initialText)
+ expect(trigger).toHaveAccessibleName(`Select date: ${trigger.textContent}`)
})
it('should render with empty value when no value is provided', () => {
const props = createDatePickerProps()
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox'))!.toHaveValue('')
+ expect(getDateTrigger())!.toHaveTextContent('time.defaultPlaceholder')
})
it('should normalize value with timezone applied', () => {
@@ -64,7 +86,7 @@ describe('DatePicker', () => {
const props = createDatePickerProps({ value, timezone: 'America/New_York' })
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox').getAttribute('value')).not.toBe('')
+ expect(getDateTrigger()).not.toHaveTextContent('time.defaultPlaceholder')
})
it('should normalize non-Dayjs value input', () => {
@@ -72,7 +94,7 @@ describe('DatePicker', () => {
const props = createDatePickerProps({ value })
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox').getAttribute('value')).not.toBe('')
+ expect(getDateTrigger()).not.toHaveTextContent('time.defaultPlaceholder')
})
})
@@ -94,7 +116,8 @@ describe('DatePicker', () => {
openPicker()
openPicker() // second click closes
- expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+ expect(getDateTrigger()).toHaveAttribute('aria-expanded', 'false')
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
})
it('should restore selected date from value when reopening', () => {
@@ -120,7 +143,7 @@ describe('DatePicker', () => {
await user.click(document.body)
expect(screen.queryAllByText(/daysInWeek/)).toHaveLength(0)
- expect(screen.getByRole('textbox')).toBeInTheDocument()
+ expect(getDateTrigger()).toBeInTheDocument()
})
})
@@ -331,7 +354,7 @@ describe('DatePicker', () => {
// The date should now appear in the header/display
// The date should now appear in the header/display
- expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+ expect(getDateTrigger())!.toBeInTheDocument()
})
it('should immediately confirm when noConfirm is true and a date is clicked', () => {
@@ -402,12 +425,13 @@ describe('DatePicker', () => {
expect(onClear).toHaveBeenCalledTimes(1)
})
- it('should clear selected date without calling onClear when picker is open', () => {
+ it('should clear selected date without calling onClear when picker is open', async () => {
+ const user = userEvent.setup()
const onClear = vi.fn()
const onChange = vi.fn()
- const renderTrigger = vi.fn((triggerProps, _state, { handleClickTrigger, handleClear }) => (
- <div {...triggerProps}>
- <button data-testid="open-trigger" onClick={handleClickTrigger}>
+ const renderTrigger = vi.fn((triggerProps, _state, { handleClear }) => (
+ <div>
+ <button {...triggerProps} data-testid="open-trigger">
Open
</button>
<button data-testid="clear-trigger" onClick={handleClear}>
@@ -423,9 +447,9 @@ describe('DatePicker', () => {
})
render(<DatePicker {...props} />)
- fireEvent.click(screen.getByTestId('open-trigger'))
- fireEvent.click(screen.getByTestId('clear-trigger'))
- fireEvent.click(screen.getByText(/operation\.ok/))
+ await user.click(screen.getByRole('button', { name: 'Open' }))
+ await user.click(screen.getByRole('button', { name: 'Clear' }))
+ await user.click(screen.getByRole('button', { name: /operation\.ok/ }))
expect(onClear).not.toHaveBeenCalled()
expect(onChange).toHaveBeenCalledWith(undefined)
@@ -561,8 +585,8 @@ describe('DatePicker', () => {
// Custom trigger
describe('Custom Trigger', () => {
it('should use renderTrigger when provided', () => {
- const renderTrigger = vi.fn((triggerProps, _state, { handleClickTrigger }) => (
- <button {...triggerProps} data-testid="custom-trigger" onClick={handleClickTrigger}>
+ const renderTrigger = vi.fn((triggerProps) => (
+ <button {...triggerProps} data-testid="custom-trigger">
Custom
</button>
))
@@ -574,8 +598,8 @@ describe('DatePicker', () => {
})
it('should open picker when custom trigger is clicked', () => {
- const renderTrigger = vi.fn((triggerProps, _state, { handleClickTrigger }) => (
- <button {...triggerProps} data-testid="custom-trigger" onClick={handleClickTrigger}>
+ const renderTrigger = vi.fn((triggerProps) => (
+ <button {...triggerProps} data-testid="custom-trigger">
Custom
</button>
))
@@ -632,7 +656,7 @@ describe('DatePicker', () => {
})
render(<DatePicker {...props} />)
- expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+ expect(getDateTrigger())!.toBeInTheDocument()
})
it('should call onChange when timezone changes with a value', () => {
@@ -697,7 +721,7 @@ describe('DatePicker', () => {
rerender(<DatePicker {...props} timezone="Asia/Tokyo" />)
expect(onChange).toHaveBeenCalledTimes(1)
- expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+ expect(getDateTrigger())!.toBeInTheDocument()
})
})
diff --git a/web/app/components/base/date-and-time-picker/date-picker/index.tsx b/web/app/components/base/date-and-time-picker/date-picker/index.tsx
index ec61d19328a..362ef9f1e15 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/index.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/index.tsx
@@ -1,3 +1,4 @@
+import type { PopoverProps } from '@langgenius/dify-ui/popover'
import type { Dayjs } from 'dayjs'
import type { DatePickerProps, Period } from '../types'
import { cn } from '@langgenius/dify-ui/cn'
@@ -28,6 +29,7 @@ const DatePicker = ({
onChange,
onClear,
placeholder,
+ disabled = false,
needTimePicker = true,
renderTrigger,
triggerWrapClassName,
@@ -38,6 +40,7 @@ const DatePicker = ({
const [isOpen, setIsOpen] = useState(false)
const [view, setView] = useState(ViewType.date)
const isInitialRef = useRef(true)
+ const triggerAreaRef = useRef<HTMLDivElement>(null)
// Normalize the value to ensure that all subsequent uses are Day.js objects.
const normalizedValue = useMemo(() => {
@@ -76,8 +79,32 @@ const DatePicker = ({
// oxlint-disable-next-line react/exhaustive-deps -- this effect intentionally runs only when timezone changes.
}, [timezone])
- const handleOpenChange = useCallback(
- (nextOpen: boolean) => {
+ const handleOpenChange = useCallback<NonNullable<PopoverProps['onOpenChange']>>(
+ (nextOpen, details) => {
+ const isFocusGuardClose =
+ !nextOpen && details.reason === 'focus-out' && details.event.type === 'focusin'
+ if (isFocusGuardClose) {
+ details.cancel()
+ // Let Base UI move focus past its guard before the controlled root closes.
+ queueMicrotask(() => {
+ setIsOpen(false)
+ setView(ViewType.date)
+ })
+ return
+ }
+ const outsideTarget =
+ details.reason === 'focus-out' && details.event instanceof FocusEvent
+ ? details.event.relatedTarget
+ : details.event.target
+ if (
+ !nextOpen &&
+ (details.reason === 'outside-press' || details.reason === 'focus-out') &&
+ outsideTarget instanceof Node &&
+ triggerAreaRef.current?.contains(outsideTarget)
+ ) {
+ details.cancel()
+ return
+ }
setIsOpen(nextOpen)
setView(ViewType.date)
if (nextOpen && normalizedValue) {
@@ -89,9 +116,7 @@ const DatePicker = ({
)
const handleClickTrigger = (e: React.MouseEvent) => {
- e.preventDefault()
e.stopPropagation()
- handleOpenChange(!isOpen)
}
const handleClear = (e: React.MouseEvent) => {
@@ -225,65 +250,73 @@ const DatePicker = ({
const displayTime = selectedDate?.format('hh:mm A') || '--:-- --'
return (
<Popover open={isOpen} onOpenChange={handleOpenChange}>
- <PopoverTrigger
- nativeButton={false}
- className={triggerWrapClassName}
- render={(props, state) => {
- if (renderTrigger) {
- return renderTrigger(props, state, {
- value: normalizedValue,
- selectedDate,
- handleClear,
- handleClickTrigger,
- })
- }
-
- const placeholderDate =
- state.open && selectedDate
- ? selectedDate.format(timeFormat)
- : placeholder || t(($) => $.defaultPlaceholder, { ns: 'time' })
-
- return (
- <div
- {...props}
- className={cn(
- 'group flex w-63 cursor-pointer items-center gap-x-0.5 rounded-lg bg-components-input-bg-normal px-2 py-1 hover:bg-state-base-hover-alt',
- props.className,
- )}
- onClick={(event) => {
- handleClickTrigger(event)
- props.onClick?.(event)
- }}
- data-testid="date-picker-trigger"
- >
- <input
- className="flex-1 cursor-pointer appearance-none truncate bg-transparent p-1 system-xs-regular text-components-input-text-filled outline-hidden placeholder:text-components-input-text-placeholder"
- readOnly
- value={state.open ? '' : displayValue}
- placeholder={placeholderDate}
- />
- <span
+ <div ref={triggerAreaRef} className={cn('min-w-0', triggerWrapClassName)}>
+ <PopoverTrigger
+ disabled={disabled}
+ onClick={handleClickTrigger}
+ className={triggerWrapClassName}
+ render={(props, state) => {
+ if (renderTrigger) {
+ return renderTrigger(props, state, {
+ value: normalizedValue,
+ selectedDate,
+ handleClear,
+ })
+ }
+
+ const triggerPlaceholder = placeholder || t(($) => $.defaultPlaceholder, { ns: 'time' })
+ const triggerDisplayValue = state.open
+ ? selectedDate?.format(timeFormat) || ''
+ : displayValue
+
+ return (
+ <div
className={cn(
- 'i-ri-calendar-line size-4 shrink-0 text-text-quaternary',
- state.open ? 'text-text-secondary' : 'group-hover:text-text-secondary',
- (displayValue || (state.open && selectedDate)) && 'group-hover:hidden',
+ 'group relative flex w-63 items-center rounded-lg bg-components-input-bg-normal hover:bg-state-base-hover-alt',
+ disabled && 'opacity-60',
+ props.className,
)}
- />
- <button
- type="button"
- aria-label={t(($) => $['operation.clear'], { ns: 'common' })}
- className={cn(
- 'hidden size-4 shrink-0 border-none bg-transparent p-0 text-text-quaternary hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden',
- (displayValue || (state.open && selectedDate)) && 'group-hover:inline-block',
- )}
- onClick={handleClear}
>
- <span className="i-ri-close-circle-fill size-4" aria-hidden="true" />
- </button>
- </div>
- )
- }}
- />
+ <button
+ {...props}
+ type="button"
+ aria-label={`${triggerPlaceholder}${triggerDisplayValue ? `: ${triggerDisplayValue}` : ''}`}
+ className="flex min-w-0 flex-1 cursor-pointer items-center gap-x-0.5 rounded-lg px-2 py-1 text-left focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden disabled:cursor-default"
+ data-testid="date-picker-trigger"
+ >
+ <span
+ className={cn(
+ 'min-w-0 flex-1 truncate p-1 system-xs-regular',
+ triggerDisplayValue
+ ? 'text-components-input-text-filled'
+ : 'text-components-input-text-placeholder',
+ )}
+ >
+ {triggerDisplayValue || triggerPlaceholder}
+ </span>
+ <span
+ aria-hidden
+ className={cn(
+ 'i-ri-calendar-line size-4 shrink-0 text-text-quaternary',
+ state.open ? 'text-text-secondary' : 'group-hover:text-text-secondary',
+ )}
+ />
+ </button>
+ {(displayValue || (state.open && selectedDate)) && !disabled && (
+ <button
+ type="button"
+ aria-label={t(($) => $['operation.clear'], { ns: 'common' })}
+ className="absolute right-2 flex size-4 shrink-0 items-center justify-center rounded-full border-none bg-components-input-bg-normal p-0 text-text-quaternary opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden [@media(hover:none)]:opacity-100"
+ onClick={handleClear}
+ >
+ <span className="i-ri-close-circle-fill size-4" aria-hidden="true" />
+ </button>
+ )}
+ </div>
+ )
+ }}
+ />
+ </div>
<PopoverContent
placement="bottom-end"
sideOffset={0}
diff --git a/web/app/components/base/date-and-time-picker/date-range-picker/index.tsx b/web/app/components/base/date-and-time-picker/date-range-picker/index.tsx
index f675101f46e..6f2ae32f182 100644
--- a/web/app/components/base/date-and-time-picker/date-range-picker/index.tsx
+++ b/web/app/components/base/date-and-time-picker/date-range-picker/index.tsx
@@ -49,45 +49,28 @@ const DateRangePicker: FC<DateRangePickerProps> = ({
placeholder: string | undefined,
onChange: (date?: Dayjs) => void,
): NonNullable<DatePickerProps['renderTrigger']> => {
- return (props, _state, { value, handleClear, handleClickTrigger }: TriggerProps) => {
+ return (props, _state, { value, handleClear }: TriggerProps) => {
const displayValue = value ? formatToLocalTime(value, locale, displayFormat) : ''
const triggerLabel = placeholder
? `${placeholder}${displayValue ? `: ${displayValue}` : ''}`
: displayValue
return (
- <div
- {...props}
- aria-disabled={disabled || undefined}
- aria-label={triggerLabel}
- className={cn(
- 'group/date-trigger relative flex h-7 min-w-0 cursor-pointer items-center rounded-lg px-1 system-sm-regular text-components-input-text-filled hover:bg-state-base-hover data-popup-open:bg-state-base-hover',
- disabled && 'cursor-default hover:bg-transparent',
- props.className,
- )}
- role="button"
- tabIndex={disabled ? -1 : 0}
- onClick={(event) => {
- if (disabled) {
- event.preventDefault()
- event.stopPropagation()
- return
- }
- handleClickTrigger(event)
- props.onClick?.(event)
- }}
- onKeyDown={(event) => {
- if (disabled) {
- event.preventDefault()
- event.stopPropagation()
- return
- }
- props.onKeyDown?.(event)
- }}
- >
- <span className={cn('truncate', !value && 'text-components-input-text-placeholder')}>
- {displayValue || placeholder}
- </span>
+ <div className="group/date-trigger relative min-w-0">
+ <button
+ {...props}
+ type="button"
+ aria-label={triggerLabel}
+ className={cn(
+ 'flex h-7 min-w-0 cursor-pointer items-center rounded-lg px-1 system-sm-regular text-components-input-text-filled hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-popup-open:bg-state-base-hover',
+ disabled && 'cursor-default hover:bg-transparent',
+ props.className,
+ )}
+ >
+ <span className={cn('truncate', !value && 'text-components-input-text-placeholder')}>
+ {displayValue || placeholder}
+ </span>
+ </button>
{clearable && value && !disabled && (
<button
type="button"
@@ -122,6 +105,7 @@ const DateRangePicker: FC<DateRangePickerProps> = ({
<span className="i-ri-calendar-line block size-3.5 text-text-tertiary" aria-hidden="true" />
</div>
<DatePicker
+ disabled={disabled}
value={start}
timezone={timezone}
onChange={onStartChange}
@@ -136,6 +120,7 @@ const DateRangePicker: FC<DateRangePickerProps> = ({
-
</span>
<DatePicker
+ disabled={disabled}
value={end}
timezone={timezone}
onChange={onEndChange}
diff --git a/web/app/components/base/date-and-time-picker/types.ts b/web/app/components/base/date-and-time-picker/types.ts
index be60bd951c5..080acbc3ad0 100644
--- a/web/app/components/base/date-and-time-picker/types.ts
+++ b/web/app/components/base/date-and-time-picker/types.ts
@@ -20,13 +20,13 @@ export type TriggerProps = {
value: Dayjs | undefined
selectedDate: Dayjs | undefined
handleClear: (e: React.MouseEvent) => void
- handleClickTrigger: (e: React.MouseEvent) => void
}
export type DatePickerProps = {
value: Dayjs | undefined
timezone?: string
placeholder?: string
+ disabled?: boolean
needTimePicker?: boolean
onChange: (date: Dayjs | undefined) => void
onClear: () => void
diff --git a/web/app/components/base/image-uploader/image-list.tsx b/web/app/components/base/image-uploader/image-list.tsx
index 29d6fc16b94..61808f69838 100644
--- a/web/app/components/base/image-uploader/image-list.tsx
+++ b/web/app/components/base/image-uploader/image-list.tsx
@@ -39,102 +39,105 @@ const ImageList: FC<ImageListProps> = ({
}
return (
- <div
- className="flex flex-wrap"
- role="list"
- aria-label={t(($) => $['imageUploader.imageList'], { ns: 'common' })}
- >
- {list.map((item) => (
- <div
- key={item._id}
- role="listitem"
- className="group relative mr-1 rounded-lg border-[0.5px] border-black/5"
- >
- {item.type === TransferMethod.local_file && item.progress !== 100 && (
- <>
+ <>
+ <ul
+ className="flex flex-wrap"
+ // Safari list semantics: Dify's preflight removes list markers.
+ // oxlint-disable-next-line jsx-a11y/no-redundant-roles -- Keep lists exposed to VoiceOver.
+ role="list"
+ aria-label={t(($) => $['imageUploader.imageList'], { ns: 'common' })}
+ >
+ {list.map((item) => (
+ <li
+ key={item._id}
+ className="group relative mr-1 rounded-lg border-[0.5px] border-black/5"
+ >
+ {item.type === TransferMethod.local_file && item.progress !== 100 && (
+ <>
+ <div
+ className="absolute inset-0 z-1 flex items-center justify-center bg-black/30"
+ style={{ left: item.progress > -1 ? `${item.progress}%` : 0 }}
+ >
+ {item.progress === -1 && (
+ <button
+ type="button"
+ aria-label={t(($) => $['operation.retry'], { ns: 'common' })}
+ className="size-5 border-none bg-transparent p-0 text-white focus-visible:ring-1 focus-visible:ring-white focus-visible:outline-hidden"
+ onClick={() => onReUpload?.(item._id)}
+ >
+ <span
+ className="i-custom-vender-line-arrows-refresh-ccw-01 size-5"
+ aria-hidden="true"
+ />
+ </button>
+ )}
+ </div>
+ {item.progress > -1 && (
+ <span className="absolute top-[50%] left-[50%] z-1 translate-x-[-50%] translate-y-[-50%] text-sm text-white mix-blend-lighten">
+ {item.progress}%
+ </span>
+ )}
+ </>
+ )}
+ {item.type === TransferMethod.remote_url && item.progress !== 100 && (
<div
- className="absolute inset-0 z-1 flex items-center justify-center bg-black/30"
- style={{ left: item.progress > -1 ? `${item.progress}%` : 0 }}
+ className={`absolute inset-0 z-1 flex items-center justify-center rounded-lg border ${
+ item.progress === -1
+ ? 'border-[#DC6803] bg-[#FEF0C7]'
+ : 'border-transparent bg-black/16'
+ } `}
+ data-testid="image-error-container"
>
+ {item.progress > -1 && (
+ <span
+ className="i-ri-loader-2-line size-5 animate-spin text-white"
+ data-testid="image-loader"
+ />
+ )}
{item.progress === -1 && (
- <button
- type="button"
- aria-label={t(($) => $['operation.retry'], { ns: 'common' })}
- className="size-5 border-none bg-transparent p-0 text-white focus-visible:ring-1 focus-visible:ring-white focus-visible:outline-hidden"
- onClick={() => onReUpload?.(item._id)}
- >
- <span
- className="i-custom-vender-line-arrows-refresh-ccw-01 size-5"
- aria-hidden="true"
- />
- </button>
+ <Tooltip>
+ <TooltipTrigger render={<AlertTriangle className="h-4 w-4 text-[#DC6803]" />} />
+ <TooltipContent>
+ {t(($) => $['imageUploader.pasteImageLinkInvalid'], { ns: 'common' })}
+ </TooltipContent>
+ </Tooltip>
)}
</div>
- {item.progress > -1 && (
- <span className="absolute top-[50%] left-[50%] z-1 translate-x-[-50%] translate-y-[-50%] text-sm text-white mix-blend-lighten">
- {item.progress}%
- </span>
- )}
- </>
- )}
- {item.type === TransferMethod.remote_url && item.progress !== 100 && (
- <div
- className={`absolute inset-0 z-1 flex items-center justify-center rounded-lg border ${
- item.progress === -1
- ? 'border-[#DC6803] bg-[#FEF0C7]'
- : 'border-transparent bg-black/16'
- } `}
- data-testid="image-error-container"
- >
- {item.progress > -1 && (
- <span
- className="i-ri-loader-2-line size-5 animate-spin text-white"
- data-testid="image-loader"
- />
- )}
- {item.progress === -1 && (
- <Tooltip>
- <TooltipTrigger render={<AlertTriangle className="h-4 w-4 text-[#DC6803]" />} />
- <TooltipContent>
- {t(($) => $['imageUploader.pasteImageLinkInvalid'], { ns: 'common' })}
- </TooltipContent>
- </Tooltip>
- )}
- </div>
- )}
- <img
- className="h-16 w-16 cursor-pointer rounded-lg border-[0.5px] border-black/5 object-cover"
- alt={item.file?.name}
- onLoad={() => handleImageLinkLoadSuccess(item)}
- onError={() => handleImageLinkLoadError(item)}
- src={item.type === TransferMethod.remote_url ? item.url : item.base64Url}
- onClick={() =>
- item.progress === 100 &&
- setImagePreviewUrl(
- (item.type === TransferMethod.remote_url ? item.url : item.base64Url) as string,
- )
- }
- />
- {!readonly && (
- <button
- type="button"
- className={cn(
- 'absolute -top-2.25 -right-2.25 z-10 h-4.5 w-4.5 items-center justify-center border-none bg-transparent p-0',
- 'rounded-2xl shadow-lg hover:bg-state-base-hover',
- item.progress === -1 ? 'flex' : 'hidden group-hover:flex',
- )}
- onClick={() => onRemove?.(item._id)}
- aria-label={t(($) => $['operation.remove'], { ns: 'common' })}
- >
- <span className="i-ri-close-line size-3 text-text-tertiary" aria-hidden="true" />
- </button>
- )}
- </div>
- ))}
+ )}
+ <img
+ className="h-16 w-16 cursor-pointer rounded-lg border-[0.5px] border-black/5 object-cover"
+ alt={item.file?.name}
+ onLoad={() => handleImageLinkLoadSuccess(item)}
+ onError={() => handleImageLinkLoadError(item)}
+ src={item.type === TransferMethod.remote_url ? item.url : item.base64Url}
+ onClick={() =>
+ item.progress === 100 &&
+ setImagePreviewUrl(
+ (item.type === TransferMethod.remote_url ? item.url : item.base64Url) as string,
+ )
+ }
+ />
+ {!readonly && (
+ <button
+ type="button"
+ className={cn(
+ 'absolute -top-2.25 -right-2.25 z-10 h-4.5 w-4.5 items-center justify-center border-none bg-transparent p-0',
+ 'rounded-2xl shadow-lg hover:bg-state-base-hover',
+ item.progress === -1 ? 'flex' : 'hidden group-hover:flex',
+ )}
+ onClick={() => onRemove?.(item._id)}
+ aria-label={t(($) => $['operation.remove'], { ns: 'common' })}
+ >
+ <span className="i-ri-close-line size-3 text-text-tertiary" aria-hidden="true" />
+ </button>
+ )}
+ </li>
+ ))}
+ </ul>
{imagePreviewUrl && (
<ImagePreview url={imagePreviewUrl} onCancel={() => setImagePreviewUrl('')} title="" />
)}
- </div>
+ </>
)
}
diff --git a/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx b/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx
index ddb9b5e854a..018e61135ba 100644
--- a/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx
+++ b/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx
@@ -107,12 +107,8 @@ const DocumentTableRow = React.memo(
onClick={handleRowClick}
>
<td className="text-left align-middle text-xs text-text-tertiary">
- <div
- className="flex items-center"
- role="presentation"
- onClick={stopPropagation}
- onKeyDown={stopPropagation}
- >
+ {/* oxlint-disable-next-line jsx-a11y/no-static-element-interactions -- Only stops child control events from reaching row navigation. */}
+ <div className="flex items-center" onClick={stopPropagation} onKeyDown={stopPropagation}>
<Checkbox className="mr-2 shrink-0" value={doc.id} aria-labelledby={documentNameId} />
{index + 1}
</div>
diff --git a/web/app/components/datasets/documents/components/operations.tsx b/web/app/components/datasets/documents/components/operations.tsx
index 2b6f5c3efdf..641a0264c6f 100644
--- a/web/app/components/datasets/documents/components/operations.tsx
+++ b/web/app/components/datasets/documents/components/operations.tsx
@@ -361,12 +361,8 @@ const Operations = ({
}
return (
- <div
- className="flex items-center"
- role="presentation"
- onClick={stopPropagation}
- onKeyDown={stopPropagation}
- >
+ // oxlint-disable-next-line jsx-a11y/no-static-element-interactions -- Only stops child control events from reaching row navigation.
+ <div className="flex items-center" onClick={stopPropagation} onKeyDown={stopPropagation}>
{isListScene && !embeddingAvailable && (
<Switch checked={false} onCheckedChange={noop} disabled={true} size="md" />
)}
diff --git a/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx b/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
index 3ccefa454a5..5f0ba0e400e 100644
--- a/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
+++ b/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
@@ -1,32 +1,26 @@
import type { ReactElement } from 'react'
+import type { DatePickerProps } from '@/app/components/base/date-and-time-picker/types'
import { fireEvent, render as rtlRender, screen } from '@testing-library/react'
import { describe, expect, it, vi } from 'vite-plus/test'
import { createAccountProfileQueryWrapper } from '@/test/console/account-profile'
import WrappedDatePicker from '../date-picker'
-type TriggerArgs = {
- handleClickTrigger: () => void
-}
-
-type DatePickerProps = {
- onChange: (value: Date | null) => void
- onClear: () => void
- renderTrigger: (
- props: React.HTMLAttributes<HTMLDivElement>,
- state: { open: boolean },
- args: TriggerArgs,
- ) => React.ReactNode
- value?: Date
-}
-
// Mock the base date picker component
vi.mock('@/app/components/base/date-and-time-picker/date-picker', () => ({
default: ({ onChange, onClear, renderTrigger, value }: DatePickerProps) => {
- const trigger = renderTrigger({}, { open: false }, { handleClickTrigger: () => {} })
+ const trigger = renderTrigger?.(
+ {},
+ { open: false, disabled: false },
+ {
+ value,
+ selectedDate: value,
+ handleClear: onClear,
+ },
+ )
return (
<div role="group" aria-label="Date picker">
{trigger}
- <button onClick={() => onChange(value || null)}>Select Date</button>
+ <button onClick={() => onChange(value)}>Select Date</button>
<button onClick={() => onClear()}>Clear Date</button>
</div>
)
diff --git a/web/app/components/datasets/metadata/base/date-picker.tsx b/web/app/components/datasets/metadata/base/date-picker.tsx
index 27255c02607..55e56ea4d2a 100644
--- a/web/app/components/datasets/metadata/base/date-picker.tsx
+++ b/web/app/components/datasets/metadata/base/date-picker.tsx
@@ -1,7 +1,4 @@
-import type {
- DatePickerProps,
- TriggerProps,
-} from '@/app/components/base/date-and-time-picker/types'
+import type { DatePickerProps } from '@/app/components/base/date-and-time-picker/types'
import { cn } from '@langgenius/dify-ui/cn'
import { RiCalendarLine, RiCloseCircleFill } from '@remixicon/react'
import { useQuery } from '@tanstack/react-query'
@@ -35,7 +32,7 @@ const WrappedDatePicker = ({ className, label, value, onChange }: Props) => {
)
const renderTrigger = useCallback<NonNullable<DatePickerProps['renderTrigger']>>(
- (props, _state, { handleClickTrigger }: TriggerProps) => {
+ (props) => {
const hasValue = Boolean(value)
const triggerText = value
? formatTimestamp(
@@ -47,7 +44,6 @@ const WrappedDatePicker = ({ className, label, value, onChange }: Props) => {
return (
<div
- {...props}
className={cn(
'group flex items-center rounded-md bg-components-input-bg-normal',
className,
@@ -55,10 +51,10 @@ const WrappedDatePicker = ({ className, label, value, onChange }: Props) => {
)}
>
<button
+ {...props}
type="button"
aria-label={label ? `${label}: ${triggerText}` : undefined}
className="flex min-w-0 grow items-center border-none bg-transparent p-0 text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
- onClick={handleClickTrigger}
>
<span className={cn('grow', hasValue ? 'text-text-secondary' : 'text-text-tertiary')}>
{triggerText}
@@ -67,7 +63,7 @@ const WrappedDatePicker = ({ className, label, value, onChange }: Props) => {
aria-hidden="true"
className={cn(
'block size-4 shrink-0',
- hasValue ? 'text-text-quaternary group-hover:hidden' : 'text-text-tertiary',
+ hasValue ? 'text-text-quaternary' : 'text-text-tertiary',
)}
/>
</button>
@@ -76,7 +72,7 @@ const WrappedDatePicker = ({ className, label, value, onChange }: Props) => {
type="button"
aria-label={label ? `${label}: ${clearLabel}` : clearLabel}
className={cn(
- 'hidden size-4 cursor-pointer rounded-full border-none bg-transparent p-0 text-text-quaternary group-hover:block hover:text-components-input-text-filled focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden',
+ 'size-4 shrink-0 cursor-pointer rounded-full border-none bg-transparent p-0 text-text-quaternary opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 hover:text-components-input-text-filled focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden [@media(hover:none)]:opacity-100',
)}
onClick={(event) => {
event.stopPropagation()
diff --git a/web/app/components/goto-anything/index.tsx b/web/app/components/goto-anything/index.tsx
index f4dde042b49..475bbbb39c2 100644
--- a/web/app/components/goto-anything/index.tsx
+++ b/web/app/components/goto-anything/index.tsx
@@ -593,7 +593,7 @@ function GotoAnythingDialog() {
? t(($) => $['gotoAnything.groups.commands'], { ns: 'app' })
: t(($) => $['gotoAnything.selectSearchType'], { ns: 'app' })}
</AutocompleteGroupLabel>
- <div className="px-4 pb-4" role="presentation">
+ <div className="px-4 pb-4">
{commandRows.map((row) => (
<AutocompleteRow
key={row.map((option) => option.shortcut).join(':')}
diff --git a/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx b/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx
index af070e07730..bb20bb2b168 100644
--- a/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx
+++ b/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx
@@ -60,9 +60,48 @@ describe('WorkspaceRoleCheckboxList', () => {
)
expect(screen.getByRole('checkbox', { name: /First role/i })).toBeInTheDocument()
+ expect(screen.getAllByRole('checkbox')).toHaveLength(mockRoles.length)
expect(screen.queryByRole('radio', { name: /First role/i })).not.toBeInTheDocument()
})
+ it('should provide one named keyboard stop per role and toggle from its label', async () => {
+ const user = userEvent.setup()
+ const onSelectedRolesChange = vi.fn()
+ render(
+ <WorkspaceRoleCheckboxList
+ selectedRoleIds={[]}
+ onSelectedRolesChange={onSelectedRolesChange}
+ />,
+ )
+
+ const firstRole = screen.getByRole('checkbox', { name: /First role/i })
+ const secondRole = screen.getByRole('checkbox', { name: /Second role/i })
+ await user.click(screen.getByText('First role'))
+ expect(onSelectedRolesChange).toHaveBeenLastCalledWith([mockRoles[0]])
+
+ firstRole.focus()
+ await user.tab()
+ expect(secondRole).toHaveFocus()
+ await user.keyboard(' ')
+ expect(onSelectedRolesChange).toHaveBeenLastCalledWith([mockRoles[1]])
+ })
+
+ it('should prevent changing disabled roles through their labels', async () => {
+ const user = userEvent.setup()
+ const onSelectedRolesChange = vi.fn()
+ render(
+ <WorkspaceRoleCheckboxList
+ selectedRoleIds={[]}
+ disabledRoleIds={['role-1']}
+ onSelectedRolesChange={onSelectedRolesChange}
+ />,
+ )
+
+ await user.click(screen.getByText('First role'))
+ expect(onSelectedRolesChange).not.toHaveBeenCalled()
+ expect(screen.getByRole('checkbox', { name: /First role/i })).toHaveAttribute('data-disabled')
+ })
+
it('should render radios when only one role is allowed', () => {
render(
<WorkspaceRoleCheckboxList
diff --git a/web/app/components/header/account-setting/members-page/member-menu.tsx b/web/app/components/header/account-setting/members-page/member-menu.tsx
index 4060f5a8be1..5d69a2b3c7a 100644
--- a/web/app/components/header/account-setting/members-page/member-menu.tsx
+++ b/web/app/components/header/account-setting/members-page/member-menu.tsx
@@ -114,7 +114,7 @@ const MemberMenu = ({
if (!canAssignRoles && !canRemove && !showTransferOwnership) return null
return (
- <div role="presentation">
+ <div>
<DropdownMenu open={open} onOpenChange={setOpen}>
<DropdownMenuTrigger
render={
diff --git a/web/app/components/header/account-setting/members-page/member-row.tsx b/web/app/components/header/account-setting/members-page/member-row.tsx
index 8a8b3bde982..eb4636107d1 100644
--- a/web/app/components/header/account-setting/members-page/member-row.tsx
+++ b/web/app/components/header/account-setting/members-page/member-row.tsx
@@ -81,11 +81,11 @@ const MemberRow = ({
<span className="flex w-30 shrink-0 items-center py-2 system-sm-regular text-text-secondary">
{formatTimeFromNow(Number(member.last_active_at || member.created_at) * 1000)}
</span>
- <span className="flex min-w-0 grow items-center gap-2 px-3" role="presentation">
+ <span className="flex min-w-0 grow items-center gap-2 px-3">
<RoleBadges className="grow" roleNames={roleNames} />
</span>
</button>
- <div className="absolute inset-y-0 right-0 flex items-center px-3" role="presentation">
+ <div className="absolute inset-y-0 right-0 flex items-center px-3">
{canManage && (
<MemberMenu
member={member}
diff --git a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx b/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx
index 8b5c1cc7a61..13414c6ec1e 100644
--- a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx
+++ b/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx
@@ -199,10 +199,10 @@ const WorkspaceRoleCheckboxList = ({
const description = getRoleDescription(role)
return (
- <div className="min-w-0 flex-1">
- <div className="system-sm-semibold text-text-secondary">{role.name}</div>
- <div className="mt-0.5 system-xs-regular text-text-tertiary">{description}</div>
- </div>
+ <span className="min-w-0 flex-1">
+ <span className="block system-sm-semibold text-text-secondary">{role.name}</span>
+ <span className="mt-0.5 block system-xs-regular text-text-tertiary">{description}</span>
+ </span>
)
}
@@ -240,31 +240,21 @@ const WorkspaceRoleCheckboxList = ({
return (
<li key={role.id}>
- <div
- role="checkbox"
- aria-checked={checked}
- aria-disabled={disabled}
- tabIndex={disabled ? -1 : 0}
+ <label
className={cn(
- 'flex cursor-pointer items-start gap-3 rounded-lg px-3 py-2.5 hover:bg-state-base-hover focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-components-input-border-active',
+ 'flex cursor-pointer items-start gap-3 rounded-lg px-3 py-2.5 hover:bg-state-base-hover',
checked && 'bg-state-accent-hover hover:bg-state-accent-hover',
disabled && 'cursor-not-allowed opacity-50 hover:bg-transparent',
)}
- onClick={handleToggle}
- onKeyDown={(e) => {
- if (e.key === ' ' || e.key === 'Enter') {
- e.preventDefault()
- handleToggle()
- }
- }}
>
<Checkbox
checked={checked}
disabled={disabled}
- className="pointer-events-none mt-0.5"
+ onCheckedChange={handleToggle}
+ className="mt-0.5"
/>
{renderRoleText(role)}
- </div>
+ </label>
</li>
)
})}
diff --git a/web/app/components/plugins/marketplace/list/__tests__/list-with-collection.spec.tsx b/web/app/components/plugins/marketplace/list/__tests__/list-with-collection.spec.tsx
index b617891a833..02df8e88684 100644
--- a/web/app/components/plugins/marketplace/list/__tests__/list-with-collection.spec.tsx
+++ b/web/app/components/plugins/marketplace/list/__tests__/list-with-collection.spec.tsx
@@ -202,7 +202,7 @@ describe('ListWithCollection', () => {
expect(screen.queryByText('plugin.marketplace.viewMore')).not.toBeInTheDocument()
expect(screen.getByRole('button', { name: 'Scroll right' })).toBeInTheDocument()
- const carousel = screen.getByRole('region')
+ const carousel = screen.getByRole('region', { name: 'Featured' })
const carouselViewport = carousel.querySelector('.overflow-hidden')
const carouselContent = carouselViewport?.firstElementChild
expect(carousel).not.toHaveClass('overflow-hidden')
diff --git a/web/app/components/plugins/marketplace/list/carousel.tsx b/web/app/components/plugins/marketplace/list/carousel.tsx
index 3b94c907295..57570f7f7d8 100644
--- a/web/app/components/plugins/marketplace/list/carousel.tsx
+++ b/web/app/components/plugins/marketplace/list/carousel.tsx
@@ -9,6 +9,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
type CarouselApi = ReturnType<typeof useEmblaCarousel>[1]
type CarouselProps = {
+ 'aria-labelledby': string
children: React.ReactNode
className?: string
showNavigation?: boolean
@@ -104,6 +105,7 @@ const CarouselControls = ({
}
const Carousel = ({
+ 'aria-labelledby': ariaLabelledBy,
children,
className,
showNavigation = true,
@@ -154,7 +156,12 @@ const Carousel = ({
}, [api])
return (
- <div className={cn('relative', className)} role="region" aria-roledescription="carousel">
+ <div
+ className={cn('relative', className)}
+ role="region"
+ aria-roledescription="carousel"
+ aria-labelledby={ariaLabelledBy}
+ >
{showNavigation && (
<CarouselControls
api={api}
diff --git a/web/app/components/plugins/marketplace/list/list-with-collection.tsx b/web/app/components/plugins/marketplace/list/list-with-collection.tsx
index 13fbcc9c98f..2654bf6961b 100644
--- a/web/app/components/plugins/marketplace/list/list-with-collection.tsx
+++ b/web/app/components/plugins/marketplace/list/list-with-collection.tsx
@@ -3,7 +3,7 @@
import type { MarketplaceCollection, SearchParamsFromCollection } from '@dify/contracts/marketplace'
import type { Plugin } from '@/app/components/plugins/types'
import { cn } from '@langgenius/dify-ui/cn'
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useId, useMemo, useState } from 'react'
import { useLocale, useTranslation } from '#i18n'
import { getLanguage } from '@/i18n-config/language'
import { useMarketplaceMoreClick } from '../atoms'
@@ -81,6 +81,7 @@ const ListWithCollection = ({
}: ListWithCollectionProps) => {
const { t } = useTranslation()
const locale = useLocale()
+ const collectionLabelPrefixId = useId()
const defaultOnMoreClick = useMarketplaceMoreClick()
const handleMoreClick = onCollectionMoreClick ?? defaultOnMoreClick
const [viewportWidth, setViewportWidth] = useState(getViewportWidth)
@@ -105,12 +106,13 @@ const ListWithCollection = ({
const pages = buildCarouselPages(plugins, itemsPerPage)
const hasMultiplePages = pages.length > 1
const isPartnersCollection = PARTNERS_COLLECTION_NAMES.has(collection.name)
+ const collectionLabelId = `${collectionLabelPrefixId}-${encodeURIComponent(collection.name)}`
return (
<div key={collection.name} className="py-3">
<div className="flex items-end justify-between">
<div>
- <div className="title-xl-semi-bold text-text-primary">
+ <div id={collectionLabelId} className="title-xl-semi-bold text-text-primary">
{collection.label[getLanguage(locale)]}
</div>
<div className="flex items-center gap-x-2 system-xs-regular text-text-tertiary">
@@ -143,6 +145,7 @@ const ListWithCollection = ({
</div>
{hasMultiplePages ? (
<Carousel
+ aria-labelledby={collectionLabelId}
className="mt-2"
showNavigation
showPagination
diff --git a/web/app/components/workflow/nodes/agent-v2/components/__tests__/edit-in-console-link.spec.tsx b/web/app/components/workflow/nodes/agent-v2/components/__tests__/edit-in-console-link.spec.tsx
index a1d2dc55426..a50d2abc3a6 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/__tests__/edit-in-console-link.spec.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/__tests__/edit-in-console-link.spec.tsx
@@ -34,9 +34,11 @@ describe('EditInConsoleLink', () => {
expect(button).toHaveAttribute('aria-disabled', 'true')
await user.hover(button)
- expect(await screen.findByRole('tooltip')).toHaveTextContent(
- 'workflow.nodes.agent.roster.editInConsoleDisabled',
- )
+ expect(
+ await screen.findByText('workflow.nodes.agent.roster.editInConsoleDisabled', {
+ selector: '[data-open]',
+ }),
+ ).toBeVisible()
})
it('includes the Manage Agents permission in the RBAC explanation', async () => {
@@ -46,8 +48,10 @@ describe('EditInConsoleLink', () => {
await user.hover(screen.getByRole('button', { name: /editInConsole/ }))
- expect(await screen.findByRole('tooltip')).toHaveTextContent(
- 'workflow.nodes.agent.roster.editInConsoleDisabledRbac',
- )
+ expect(
+ await screen.findByText('workflow.nodes.agent.roster.editInConsoleDisabledRbac', {
+ selector: '[data-open]',
+ }),
+ ).toBeVisible()
})
})
diff --git a/web/app/components/workflow/nodes/agent-v2/components/edit-in-console-link.tsx b/web/app/components/workflow/nodes/agent-v2/components/edit-in-console-link.tsx
index 2905f58b824..560b674a467 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/edit-in-console-link.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/edit-in-console-link.tsx
@@ -60,7 +60,7 @@ export function EditInConsoleLink({
</Button>
}
/>
- <TooltipContent role="tooltip">{disabledMessage}</TooltipContent>
+ <TooltipContent>{disabledMessage}</TooltipContent>
</Tooltip>
)
}
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx
index 31632773f96..cb8457cb8d9 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx
@@ -1,7 +1,4 @@
-import type {
- DatePickerProps,
- TriggerProps,
-} from '@/app/components/base/date-and-time-picker/types'
+import type { DatePickerProps } from '@/app/components/base/date-and-time-picker/types'
import { cn } from '@langgenius/dify-ui/cn'
import { RiCalendarLine, RiCloseCircleFill } from '@remixicon/react'
import { useQuery } from '@tanstack/react-query'
@@ -31,7 +28,7 @@ const ConditionDate = ({ value, onChange }: ConditionDateProps) => {
)
const renderTrigger = useCallback<NonNullable<DatePickerProps['renderTrigger']>>(
- (props, _state, { handleClickTrigger }: TriggerProps) => {
+ (props) => {
const hasValue = Boolean(value)
const triggerText = value
? dayjs(value * 1000)
@@ -40,21 +37,20 @@ const ConditionDate = ({ value, onChange }: ConditionDateProps) => {
: t(($) => $['nodes.knowledgeRetrieval.metadata.panel.datePlaceholder'], { ns: 'workflow' })
return (
- <div {...props} className={cn('group flex items-center', props.className)}>
+ <div className={cn('group flex items-center', props.className)}>
<button
+ {...props}
type="button"
className={cn(
'mr-0.5 flex h-6 grow cursor-pointer items-center border-none bg-transparent px-1 py-0 text-left system-sm-regular focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden',
hasValue ? 'text-text-secondary' : 'text-text-tertiary',
)}
- onClick={handleClickTrigger}
>
<span className="grow">{triggerText}</span>
<RiCalendarLine
className={cn(
'block size-4 shrink-0',
hasValue ? 'text-text-quaternary' : 'text-text-tertiary',
- hasValue && 'group-hover:hidden',
)}
aria-hidden="true"
/>
@@ -63,7 +59,7 @@ const ConditionDate = ({ value, onChange }: ConditionDateProps) => {
<button
type="button"
aria-label={t(($) => $['operation.clear'], { ns: 'common' })}
- className="hidden size-4 shrink-0 cursor-pointer border-none bg-transparent p-0 text-text-quaternary group-hover:block hover:text-components-input-text-filled focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+ className="size-4 shrink-0 cursor-pointer border-none bg-transparent p-0 text-text-quaternary opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 hover:text-components-input-text-filled focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden [@media(hover:none)]:opacity-100"
onClick={(e) => {
e.stopPropagation()
handleDateChange()
diff --git a/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-picker.spec.tsx b/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-picker.spec.tsx
index c5fa2067147..104074850ee 100644
--- a/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-picker.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-picker.spec.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import { describe, expect, it, vi } from 'vite-plus/test'
import ToolDatePicker from '../tool-date-picker'
@@ -56,10 +57,36 @@ describe('ToolDatePicker', () => {
/>,
)
- expect(screen.getByRole('button', { name: 'Select date: May 1, 2024' })).toHaveAttribute(
- 'aria-disabled',
- 'true',
- )
+ expect(screen.getByRole('button', { name: 'Select date: May 1, 2024' })).toBeDisabled()
expect(screen.queryByRole('button', { name: 'Clear' })).not.toBeInTheDocument()
})
+
+ it('opens from the keyboard and restores focus to the date button on dismissal', async () => {
+ const user = userEvent.setup()
+ render(<ToolDatePicker value="2024-05-01" onChange={vi.fn()} timezone="UTC" />)
+
+ const trigger = screen.getByRole('button', { name: 'Select date: May 1, 2024' })
+ expect(within(trigger).queryByRole('button')).not.toBeInTheDocument()
+ await user.tab()
+ expect(trigger).toHaveFocus()
+ await user.keyboard('{Enter}')
+ expect(await screen.findByRole('dialog')).toBeInTheDocument()
+ expect(trigger).toHaveAttribute('aria-expanded', 'true')
+ await user.keyboard('{Escape}')
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+ expect(trigger).toHaveFocus()
+ })
+
+ it('lets the keyboard reach and activate clear without opening the calendar', async () => {
+ const user = userEvent.setup()
+ const onChange = vi.fn()
+ render(<ToolDatePicker value="2024-05-01" onChange={onChange} timezone="UTC" />)
+
+ await user.tab()
+ await user.tab()
+ expect(screen.getByRole('button', { name: 'Clear' })).toHaveFocus()
+ await user.keyboard(' ')
+ expect(onChange).toHaveBeenCalledExactlyOnceWith('')
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+ })
})
diff --git a/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-range-picker.spec.tsx b/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-range-picker.spec.tsx
index 4ca8ee899a0..b0405330c00 100644
--- a/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-range-picker.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/__tests__/tool-date-range-picker.spec.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import { describe, expect, it, vi } from 'vite-plus/test'
import ToolDateRangePicker from '../tool-date-range-picker'
@@ -48,6 +49,29 @@ describe('ToolDateRangePicker', () => {
expect(onChange).toHaveBeenCalledWith(JSON.stringify({ end: '2024-05-03' }))
})
+ it('keeps both clear actions separate from their date triggers in keyboard order', async () => {
+ const user = userEvent.setup()
+ render(
+ <ToolDateRangePicker
+ value={JSON.stringify({ start: '2024-05-01', end: '2024-05-03' })}
+ onChange={vi.fn()}
+ timezone="UTC"
+ />,
+ )
+
+ for (const name of [
+ 'Start date: May 1, 2024',
+ 'Start date: Clear',
+ 'End date: May 3, 2024',
+ 'End date: Clear',
+ ]) {
+ const button = screen.getByRole('button', { name })
+ expect(within(button).queryByRole('button')).not.toBeInTheDocument()
+ await user.tab()
+ expect(button).toHaveFocus()
+ }
+ })
+
it('returns an empty value when clearing the last boundary', () => {
const onChange = vi.fn()
render(
diff --git a/web/app/components/workflow/nodes/tool/components/tool-date-picker.tsx b/web/app/components/workflow/nodes/tool/components/tool-date-picker.tsx
index 62cb878415f..f895dc6b905 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-date-picker.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-date-picker.tsx
@@ -39,57 +39,40 @@ const ToolDatePicker: FC<Props> = ({
const parsedValue = toDayjs(rawValue, { timezone, format: DATE_FMT })
const renderTrigger = useCallback<NonNullable<DatePickerProps['renderTrigger']>>(
- (props, _state, { value: date, handleClear, handleClickTrigger }: TriggerProps) => {
+ (props, _state, { value: date, handleClear }: TriggerProps) => {
const displayValue = date ? formatToLocalTime(date, locale, displayFormat) : ''
const triggerLabel = resolvedPlaceholder
? `${resolvedPlaceholder}${displayValue ? `: ${displayValue}` : ''}`
: displayValue
return (
- <div
- {...props}
- aria-disabled={readOnly || undefined}
- aria-label={triggerLabel}
- className={cn(
- 'group/date-trigger relative flex h-8 min-w-0 grow cursor-pointer items-center space-x-0.5 rounded-lg bg-components-input-bg-normal px-2 system-sm-regular text-components-input-text-filled hover:bg-state-base-hover data-popup-open:bg-state-base-hover',
- readOnly && 'cursor-default opacity-60 hover:bg-components-input-bg-normal',
- props.className,
- )}
- role="button"
- tabIndex={readOnly ? -1 : 0}
- onClick={(event) => {
- if (readOnly) {
- event.preventDefault()
- event.stopPropagation()
- return
- }
- handleClickTrigger(event)
- props.onClick?.(event)
- }}
- onKeyDown={(event) => {
- if (readOnly) {
- event.preventDefault()
- event.stopPropagation()
- return
- }
- props.onKeyDown?.(event)
- }}
- >
- <div className="shrink-0 p-px">
- <span
- className="i-ri-calendar-line block size-3.5 text-text-tertiary"
- aria-hidden="true"
- />
- </div>
- <span
+ <div className="group/date-trigger relative w-full min-w-0">
+ <button
+ {...props}
+ type="button"
+ aria-label={triggerLabel}
className={cn(
- 'min-w-0 flex-1 truncate px-1',
- !date && 'text-components-input-text-placeholder',
- date && 'pr-5',
+ 'flex h-8 w-full min-w-0 cursor-pointer items-center space-x-0.5 rounded-lg bg-components-input-bg-normal px-2 text-left system-sm-regular text-components-input-text-filled hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-popup-open:bg-state-base-hover',
+ readOnly && 'cursor-default opacity-60 hover:bg-components-input-bg-normal',
+ props.className,
)}
>
- {displayValue || resolvedPlaceholder}
- </span>
+ <span className="shrink-0 p-px">
+ <span
+ className="i-ri-calendar-line block size-3.5 text-text-tertiary"
+ aria-hidden="true"
+ />
+ </span>
+ <span
+ className={cn(
+ 'min-w-0 flex-1 truncate px-1',
+ !date && 'text-components-input-text-placeholder',
+ date && 'pr-5',
+ )}
+ >
+ {displayValue || resolvedPlaceholder}
+ </span>
+ </button>
{date && !readOnly && (
<button
type="button"
@@ -111,6 +94,7 @@ const ToolDatePicker: FC<Props> = ({
return (
<DatePicker
+ disabled={readOnly}
value={parsedValue}
timezone={timezone}
onChange={(date) => onChange(date?.format(DATE_FMT) ?? '')}
diff --git a/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx b/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx
index b0abc7600c6..3d58ce7c6ed 100644
--- a/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx
+++ b/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx
@@ -784,13 +784,19 @@ describe('Agent access surface cards', () => {
await user.tab()
expect(accessSwitch).toHaveFocus()
- expect(await screen.findByRole('tooltip')).toHaveTextContent(
- 'agentV2.agentDetail.access.publishRequired',
- )
+ expect(
+ await screen.findByText('agentV2.agentDetail.access.publishRequired', {
+ selector: '[data-open]',
+ }),
+ ).toBeVisible()
await user.tab()
await waitFor(() => {
- expect(screen.queryByRole('tooltip')).not.toBeInTheDocument()
+ expect(
+ screen.queryByText('agentV2.agentDetail.access.publishRequired', {
+ selector: '[data-open]',
+ }),
+ ).not.toBeInTheDocument()
})
await user.hover(
@@ -798,9 +804,11 @@ describe('Agent access surface cards', () => {
name: 'agentV2.agentDetail.access.webApp.actions.open',
}),
)
- expect(await screen.findByRole('tooltip')).toHaveTextContent(
- 'agentV2.agentDetail.access.publishRequired',
- )
+ expect(
+ await screen.findByText('agentV2.agentDetail.access.publishRequired', {
+ selector: '[data-open]',
+ }),
+ ).toBeVisible()
})
})
@@ -976,9 +984,11 @@ describe('Agent access surface cards', () => {
await user.tab()
expect(accessSwitch).toHaveFocus()
- expect(await screen.findByRole('tooltip')).toHaveTextContent(
- 'agentV2.agentDetail.access.publishRequired',
- )
+ expect(
+ await screen.findByText('agentV2.agentDetail.access.publishRequired', {
+ selector: '[data-open]',
+ }),
+ ).toBeVisible()
})
it('should show the unavailable status when the Service API query fails', async () => {
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/advanced/env.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/advanced/env.tsx
index dc2cc12bc80..e3243653b73 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/advanced/env.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/advanced/env.tsx
@@ -131,22 +131,21 @@ function EnvEditorScope({
function EnvEditorCell({
children,
className,
- role,
+ header = false,
}: {
children?: React.ReactNode
className?: string
- role?: React.AriaRole
+ header?: boolean
}) {
+ const Cell = header ? 'th' : 'td'
+
return (
- <div
- role={role}
- className={cn(
- 'flex min-h-7 min-w-0 items-center border-r border-divider-subtle last:border-r-0',
- className,
- )}
+ <Cell
+ scope={header ? 'col' : undefined}
+ className="h-7 min-w-0 border-r border-divider-subtle p-0 text-left align-middle font-normal last:border-r-0"
>
- {children}
- </div>
+ <div className={cn('flex h-full min-h-7 min-w-0 items-center', className)}>{children}</div>
+ </Cell>
)
}
@@ -204,21 +203,16 @@ function EnvEditorRow({
}) {
const { t } = useTranslation('agentV2')
const [isValueRevealed, setIsValueRevealed] = useState(false)
- const gridClassName = showScope
- ? 'grid-cols-[minmax(76px,1fr)_minmax(84px,1.25fr)_72px_28px]'
- : 'grid-cols-[minmax(120px,180px)_minmax(160px,1fr)_28px]'
const shouldMaskValue = variable.masked && !isValueRevealed
const displayedValue = shouldMaskValue ? maskedEnvValue : variable.value
return (
- <div
- role="row"
+ <tr
className={cn(
- 'grid min-h-7 border-t border-divider-subtle',
- gridClassName,
+ 'border-t border-divider-subtle',
isHighlighted && 'bg-background-default-hover',
)}
>
- <EnvEditorCell role="cell">
+ <EnvEditorCell>
{editable ? (
<EnvEditorInput
aria-label={t(($) => $['agentDetail.configure.advancedSettings.envEditor.keyColumn'])}
@@ -240,7 +234,7 @@ function EnvEditorRow({
</span>
)}
</EnvEditorCell>
- <EnvEditorCell role="cell">
+ <EnvEditorCell>
{editable && !shouldMaskValue ? (
<EnvEditorInput
aria-label={t(($) => $['agentDetail.configure.advancedSettings.envEditor.valueColumn'])}
@@ -279,11 +273,11 @@ function EnvEditorRow({
)}
</EnvEditorCell>
{showScope && (
- <EnvEditorCell role="cell">
+ <EnvEditorCell>
<EnvEditorScope editable={editable} scope={variable.scope} onChange={onScopeChange} />
</EnvEditorCell>
)}
- <EnvEditorCell role="cell" className="justify-center">
+ <EnvEditorCell className="justify-center">
{editable && (
<button
type="button"
@@ -302,7 +296,7 @@ function EnvEditorRow({
</button>
)}
</EnvEditorCell>
- </div>
+ </tr>
)
}
@@ -314,9 +308,6 @@ function EnvEditorDraftRow({
showScope?: boolean
}) {
const { t } = useTranslation('agentV2')
- const gridClassName = showScope
- ? 'grid-cols-[minmax(76px,1fr)_minmax(84px,1.25fr)_72px_28px]'
- : 'grid-cols-[minmax(120px,180px)_minmax(160px,1fr)_28px]'
const keyPlaceholder = t(
($) => $['agentDetail.configure.advancedSettings.envEditor.keyPlaceholder'],
)
@@ -345,16 +336,16 @@ function EnvEditorDraftRow({
}
return (
- <div role="row" className={cn('grid min-h-7 border-t border-divider-subtle', gridClassName)}>
- <EnvEditorCell role="cell">{renderDraftPlaceholder(keyPlaceholder)}</EnvEditorCell>
- <EnvEditorCell role="cell">{renderDraftValueCell()}</EnvEditorCell>
+ <tr className="border-t border-divider-subtle">
+ <EnvEditorCell>{renderDraftPlaceholder(keyPlaceholder)}</EnvEditorCell>
+ <EnvEditorCell>{renderDraftValueCell()}</EnvEditorCell>
{showScope && (
- <EnvEditorCell role="cell">
+ <EnvEditorCell>
<EnvEditorScope scope="plain" />
</EnvEditorCell>
)}
- <EnvEditorCell role="cell" />
- </div>
+ <EnvEditorCell />
+ </tr>
)
}
@@ -385,9 +376,6 @@ export function EnvVariablesTable({
}) {
const { t } = useTranslation('agentV2')
const tableLabel = t(($) => $['agentDetail.configure.advancedSettings.envEditor.label'])
- const gridClassName = showScope
- ? 'grid-cols-[minmax(76px,1fr)_minmax(84px,1.25fr)_72px_28px]'
- : 'grid-cols-[minmax(120px,180px)_minmax(160px,1fr)_28px]'
const checkEnvVariableKey = (key: string) => {
const { isValid, errorMessageKey } = checkKeys([key], false)
if (!isValid) {
@@ -410,57 +398,74 @@ export function EnvVariablesTable({
}
return (
- <div
- role="table"
- aria-label={tableLabel}
- className="overflow-hidden rounded-lg border border-divider-regular bg-components-panel-on-panel-item-bg shadow-xs shadow-shadow-shadow-3"
- >
- <div role="row" className={cn('grid min-h-7 text-text-tertiary', gridClassName)}>
- <EnvEditorCell role="columnheader">
- <span className="px-3 system-xs-medium-uppercase">
- {t(($) => $['agentDetail.configure.advancedSettings.envEditor.keyColumn'])}
- </span>
- </EnvEditorCell>
- <EnvEditorCell role="columnheader">
- <span className="px-3 system-xs-medium-uppercase">
- {t(($) => $['agentDetail.configure.advancedSettings.envEditor.valueColumn'])}
- </span>
- </EnvEditorCell>
- {showScope && (
- <EnvEditorCell role="columnheader">
- <span className="px-3 system-xs-medium-uppercase">
- {t(($) => $['agentDetail.configure.advancedSettings.envEditor.scopeColumn'])}
- </span>
- </EnvEditorCell>
- )}
- <EnvEditorCell role="columnheader" className="justify-center">
- {onAdd && (
- <button
- type="button"
- aria-label={t(($) => $['agentDetail.configure.advancedSettings.envEditor.add'])}
- onClick={() => onAdd()}
- className="flex size-6 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
- >
- <span aria-hidden className="i-ri-add-line size-4" />
- </button>
- )}
- </EnvEditorCell>
- </div>
- {envVariables.map((variable, index) => (
- <EnvEditorRow
- key={variable.id}
- autoFocusField={focusedVariable?.id === variable.id ? focusedVariable.field : undefined}
- variable={variable}
- editable={editable}
- isHighlighted={index === highlightedIndex}
- onDelete={() => onDelete(variable.id)}
- onKeyChange={(key) => handleKeyChange(variable.id, key)}
- onScopeChange={(scope) => onScopeChange(variable.id, scope)}
- onValueChange={(value) => onValueChange?.(variable.id, value)}
- showScope={showScope}
- />
- ))}
- {showDraftRow && <EnvEditorDraftRow onAdd={onAdd} showScope={showScope} />}
+ <div className="@container overflow-hidden rounded-lg border border-divider-regular bg-components-panel-on-panel-item-bg shadow-xs shadow-shadow-shadow-3">
+ <table className="w-full table-fixed border-collapse">
+ <caption className="sr-only">{tableLabel}</caption>
+ <colgroup>
+ <col
+ style={{
+ width: showScope
+ ? 'calc((100cqw - 100px) * 4 / 9)'
+ : 'min(180px, calc(100cqw - 188px))',
+ }}
+ />
+ <col />
+ {showScope && <col className="w-18" />}
+ <col className="w-7" />
+ </colgroup>
+ <thead>
+ <tr className="text-text-tertiary">
+ <EnvEditorCell header>
+ <span className="px-3 system-xs-medium-uppercase">
+ {t(($) => $['agentDetail.configure.advancedSettings.envEditor.keyColumn'])}
+ </span>
+ </EnvEditorCell>
+ <EnvEditorCell header>
+ <span className="px-3 system-xs-medium-uppercase">
+ {t(($) => $['agentDetail.configure.advancedSettings.envEditor.valueColumn'])}
+ </span>
+ </EnvEditorCell>
+ {showScope && (
+ <EnvEditorCell header>
+ <span className="px-3 system-xs-medium-uppercase">
+ {t(($) => $['agentDetail.configure.advancedSettings.envEditor.scopeColumn'])}
+ </span>
+ </EnvEditorCell>
+ )}
+ <EnvEditorCell header className="justify-center">
+ {onAdd && (
+ <button
+ type="button"
+ aria-label={t(($) => $['agentDetail.configure.advancedSettings.envEditor.add'])}
+ onClick={() => onAdd()}
+ className="flex size-6 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
+ >
+ <span aria-hidden className="i-ri-add-line size-4" />
+ </button>
+ )}
+ </EnvEditorCell>
+ </tr>
+ </thead>
+ <tbody>
+ {envVariables.map((variable, index) => (
+ <EnvEditorRow
+ key={variable.id}
+ autoFocusField={
+ focusedVariable?.id === variable.id ? focusedVariable.field : undefined
+ }
+ variable={variable}
+ editable={editable}
+ isHighlighted={index === highlightedIndex}
+ onDelete={() => onDelete(variable.id)}
+ onKeyChange={(key) => handleKeyChange(variable.id, key)}
+ onScopeChange={(scope) => onScopeChange(variable.id, scope)}
+ onValueChange={(value) => onValueChange?.(variable.id, value)}
+ showScope={showScope}
+ />
+ ))}
+ {showDraftRow && <EnvEditorDraftRow onAdd={onAdd} showScope={showScope} />}
+ </tbody>
+ </table>
</div>
)
}
diff --git a/web/features/agent-v2/agent-detail/monitoring/time-range-picker.tsx b/web/features/agent-v2/agent-detail/monitoring/time-range-picker.tsx
index 9efebb72c53..3c6bf916a5c 100644
--- a/web/features/agent-v2/agent-detail/monitoring/time-range-picker.tsx
+++ b/web/features/agent-v2/agent-detail/monitoring/time-range-picker.tsx
@@ -77,32 +77,17 @@ function DateRangePart({
}) {
const locale = useLocale()
- const renderDate: DatePickerProps['renderTrigger'] = (
- props,
- _state,
- { value, handleClickTrigger },
- ) => (
- <div
+ const renderDate: DatePickerProps['renderTrigger'] = (props, _state, { value }) => (
+ <button
{...props}
- role="button"
- tabIndex={0}
+ type="button"
className={cn(
'flex h-7 cursor-pointer items-center rounded-lg px-1 system-sm-regular text-components-input-text-filled hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-popup-open:bg-state-base-hover',
props.className,
)}
- onClick={(event) => {
- handleClickTrigger(event)
- props.onClick?.(event)
- }}
- onKeyDown={(event) => {
- if (event.key !== 'Enter' && event.key !== ' ') return
-
- event.preventDefault()
- event.currentTarget.click()
- }}
>
{value ? formatToLocalTime(value, locale, 'MMM D') : ''}
- </div>
+ </button>
)
const availableStartDate = end.subtract(30, 'day')
diff --git a/web/features/skills/__tests__/detail-page.spec.tsx b/web/features/skills/__tests__/detail-page.spec.tsx
index c09cd6636d4..3416047bbf8 100644
--- a/web/features/skills/__tests__/detail-page.spec.tsx
+++ b/web/features/skills/__tests__/detail-page.spec.tsx
@@ -4602,7 +4602,7 @@ describe('SkillDetailPage', () => {
})
renderSkillDetailPage()
- const folder = await waitFor(() => getFileTreeItem('scripts'))
+ const folder = await waitFor(() => getFileTreeButton('scripts'))
expect(getFileTreeButton('scripts/example.ts')).toBeInTheDocument()
await user.dblClick(folder)
@@ -5683,6 +5683,7 @@ describe('SkillDetailPage', () => {
})
it('expands a collapsed folder after a two-second drag hover', async () => {
+ const user = userEvent.setup()
mocks.skillDetail = createSkillDetail({
files: [
...createSkillDetail().files!,
@@ -5702,7 +5703,7 @@ describe('SkillDetailPage', () => {
renderSkillDetailPage()
const folder = await waitFor(() => getFileTreeItem('scripts'))
- fireEvent.doubleClick(folder)
+ await user.dblClick(getFileTreeButton('scripts'))
expect(document.querySelector('[title="scripts/example.ts"]')).not.toBeInTheDocument()
vi.useFakeTimers()
diff --git a/web/features/skills/detail/__tests__/file-tree-items.spec.tsx b/web/features/skills/detail/__tests__/file-tree-items.spec.tsx
index 30ec3ccc629..51b6ff0f774 100644
--- a/web/features/skills/detail/__tests__/file-tree-items.spec.tsx
+++ b/web/features/skills/detail/__tests__/file-tree-items.spec.tsx
@@ -203,7 +203,9 @@ describe('FileTreeItem', () => {
const folder = screen.getByText('scripts').closest('[data-skill-file-tree-item]')
expect(folder).toBeInstanceOf(HTMLElement)
- await user.dblClick(folder as HTMLElement)
+ const folderButton = screen.getByRole('button', { name: 'scripts' })
+ expect(within(folderButton).queryByRole('button')).not.toBeInTheDocument()
+ await user.dblClick(folderButton)
expect(props.onToggleFolder).toHaveBeenCalledWith('scripts')
await user.click(
@@ -223,6 +225,19 @@ describe('FileTreeItem', () => {
expect(props.onCreate).toHaveBeenCalledWith('directory', 'scripts')
})
+ it('selects folders from the keyboard without including their action menu', async () => {
+ const user = userEvent.setup()
+ const { props } = renderFileTreeItem({ selectedPaths: ['scripts'] }, createFolderNode())
+ const folder = screen.getByRole('button', { name: 'scripts' })
+ folder.focus()
+ await user.keyboard('{Enter}')
+ expect(props.onItemSelect).toHaveBeenCalledTimes(1)
+ await user.keyboard(' ')
+ expect(props.onItemSelect).toHaveBeenCalledTimes(2)
+ await user.tab()
+ expect(screen.getAllByRole('button', { name: 'common.operation.more' })[0]).toHaveFocus()
+ })
+
it('renders a rename input for the active inline action', async () => {
const user = userEvent.setup()
const onSubmitInlineAction = vi.fn()
diff --git a/web/features/skills/detail/file-tree-items.tsx b/web/features/skills/detail/file-tree-items.tsx
index 973ccfd53c6..4207e7ab7b7 100644
--- a/web/features/skills/detail/file-tree-items.tsx
+++ b/web/features/skills/detail/file-tree-items.tsx
@@ -564,33 +564,31 @@ export function FileTreeItem({
data-skill-file-tree-item
draggable={!readonly}
className={cn(
- 'group flex h-6 w-full min-w-0 items-center gap-2 rounded-md pr-1.5 pl-2 system-xs-regular text-text-secondary outline-hidden transition-colors hover:bg-components-panel-on-panel-item-bg-hover hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+ 'group flex h-6 w-full min-w-0 items-center rounded-md pr-1.5 text-text-secondary transition-colors hover:bg-components-panel-on-panel-item-bg-hover hover:text-text-primary',
isDropTarget && 'bg-state-accent-hover ring-1 ring-state-accent-solid ring-inset',
isSelected && 'bg-state-accent-hover text-text-accent',
isDragging && 'opacity-30',
)}
- role="button"
- tabIndex={0}
- title={node.path}
- onClick={(event) => onItemSelect(node, event)}
onContextMenu={(event) => {
event.stopPropagation()
onItemSelect(node, event)
}}
onDragEnd={handleDragEnd}
onDragStart={handleDragStart}
- onDoubleClick={() => onToggleFolder(node.path)}
- onKeyDown={(event) => {
- if (event.key !== 'Enter' && event.key !== ' ') return
- event.preventDefault()
- onItemSelect(node, event as unknown as MouseEvent<HTMLElement>)
- }}
>
- <span
- aria-hidden
- className="i-ri-folder-5-line size-4 shrink-0 text-text-secondary"
- />
- {nameNode}
+ <button
+ type="button"
+ className="flex h-full w-0 min-w-0 flex-1 cursor-pointer items-center gap-2 rounded-md px-2 text-left system-xs-regular outline-hidden transition-colors group-hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ title={node.path}
+ onClick={(event) => onItemSelect(node, event)}
+ onDoubleClick={() => onToggleFolder(node.path)}
+ >
+ <span
+ aria-hidden
+ className="i-ri-folder-5-line size-4 shrink-0 text-text-secondary"
+ />
+ {nameNode}
+ </button>
{!readonly && detail && (
<FileActions
node={node}