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.

fix(web): expose selection state that was shown by color alone (#43995)

yyh4a8eaf161279
diff --git a/packages/dify-ui/src/toggle/index.tsx b/packages/dify-ui/src/toggle/index.tsx
index 75494b0bb60..f2f25dfb85b 100644
--- a/packages/dify-ui/src/toggle/index.tsx
+++ b/packages/dify-ui/src/toggle/index.tsx
@@ -1,12 +1,22 @@
'use client'
import { Toggle as BaseToggle } from '@base-ui/react/toggle'
+import { cn } from '../cn'
+import { focusRingClassName } from '../internal/focus'
+import { resolveClassName } from '../internal/resolve-class-name'
type ToggleProps<Value extends string = string> = BaseToggle.Props<Value>
type ToggleChangeEventReason = BaseToggle.ChangeEventReason
type ToggleChangeEventDetails = BaseToggle.ChangeEventDetails
-const Toggle = BaseToggle
+function Toggle<Value extends string = string>({ className, ...props }: ToggleProps<Value>) {
+ return (
+ <BaseToggle<Value>
+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
export { Toggle }
diff --git a/web/app/components/integrations/sidebar-nav-item.tsx b/web/app/components/integrations/sidebar-nav-item.tsx
index 17e312ee563..143729117de 100644
--- a/web/app/components/integrations/sidebar-nav-item.tsx
+++ b/web/app/components/integrations/sidebar-nav-item.tsx
@@ -104,7 +104,7 @@ export function IntegrationSidebarNavItem({
return (
<button
type="button"
- aria-pressed={isActive}
+ aria-current={isActive ? 'true' : undefined}
className={cn('border-none bg-transparent', className)}
onClick={() => onSelect(item.section!)}
>
diff --git a/web/app/components/plugins/plugin-page/__tests__/plugins-panel.spec.tsx b/web/app/components/plugins/plugin-page/__tests__/plugins-panel.spec.tsx
index d2afd68aa08..f22eec9a5b9 100644
--- a/web/app/components/plugins/plugin-page/__tests__/plugins-panel.spec.tsx
+++ b/web/app/components/plugins/plugin-page/__tests__/plugins-panel.spec.tsx
@@ -544,10 +544,7 @@ describe('PluginsPanel', () => {
expect(builtinToolCard).toHaveTextContent('builtin-tool')
expect(builtinToolCard).toHaveAttribute('data-show-built-in-badge', 'true')
expect(pluginList).toContainElement(builtinToolCard)
- expect(screen.getByRole('button', { name: 'builtin-tool' })).toHaveAttribute(
- 'aria-pressed',
- 'false',
- )
+ expect(screen.getByRole('button', { name: 'builtin-tool' })).not.toHaveAttribute('aria-current')
expect(
pluginItem.compareDocumentPosition(builtinToolCard) & Node.DOCUMENT_POSITION_FOLLOWING,
).toBeTruthy()
@@ -600,7 +597,7 @@ describe('PluginsPanel', () => {
await user.click(builtinToolCard)
- expect(builtinToolCard).toHaveAttribute('aria-pressed', 'true')
+ expect(builtinToolCard).toHaveAttribute('aria-current', 'true')
expect(pluginCard).toHaveAttribute('aria-pressed', 'false')
expect(screen.getByTestId('builtin-tool-detail')).toHaveTextContent('builtin-tool')
expect(screen.queryByTestId('plugin-detail-panel')).not.toBeInTheDocument()
@@ -608,7 +605,7 @@ describe('PluginsPanel', () => {
await user.click(pluginCard)
expect(pluginCard).toHaveAttribute('aria-pressed', 'true')
- expect(builtinToolCard).toHaveAttribute('aria-pressed', 'false')
+ expect(builtinToolCard).not.toHaveAttribute('aria-current')
expect(screen.getByTestId('plugin-detail-panel')).toHaveTextContent('tool-plugin')
expect(screen.queryByTestId('builtin-tool-detail')).not.toBeInTheDocument()
})
diff --git a/web/app/components/plugins/plugin-page/plugins-panel-results.tsx b/web/app/components/plugins/plugin-page/plugins-panel-results.tsx
index c8da9033855..2c0d990eb27 100644
--- a/web/app/components/plugins/plugin-page/plugins-panel-results.tsx
+++ b/web/app/components/plugins/plugin-page/plugins-panel-results.tsx
@@ -157,7 +157,7 @@ const PluginsPanelResults = ({
<button
key={collection.id}
type="button"
- aria-pressed={currentBuiltinToolID === collection.id}
+ aria-current={currentBuiltinToolID === collection.id ? 'true' : undefined}
className="min-w-0 cursor-pointer appearance-none border-0 bg-transparent p-0 text-left"
data-step-by-step-tour-target={
filteredList.length === 0 && index === 0 ? firstBuiltinToolTarget : undefined
diff --git a/web/app/components/tools/tool-provider-grid.tsx b/web/app/components/tools/tool-provider-grid.tsx
index 2c5009e787d..ebaa4ad2697 100644
--- a/web/app/components/tools/tool-provider-grid.tsx
+++ b/web/app/components/tools/tool-provider-grid.tsx
@@ -1,6 +1,5 @@
'use client'
-import type { KeyboardEvent } from 'react'
import type { Collection } from './types'
import type { ToolCategory } from '@/app/components/integrations/routes'
import type { CardPayload } from '@/app/components/plugins/card'
@@ -62,8 +61,6 @@ const collectionToCardPayload = (collection: Collection): CardPayload => {
}
}
-const isKeyboardSelectEvent = (event: KeyboardEvent) => event.key === 'Enter' || event.key === ' '
-
export function ToolProviderGrid({
activeTab,
collections,
@@ -133,22 +130,16 @@ export function ToolProviderGrid({
/>
)}
{collections.map((collection, index) => (
- <div
+ <button
key={collection.id}
- role="button"
- tabIndex={0}
- aria-pressed={currentProviderId === collection.id}
+ type="button"
+ aria-current={currentProviderId === collection.id ? 'true' : undefined}
data-step-by-step-tour-target={index === 0 ? stepByStepTourTarget : undefined}
className={cn(
+ 'block w-full appearance-none border-0 bg-transparent p-0 text-left',
useCustomToolGrid && 'min-w-0',
useIntegrationsCard && !useCustomToolGrid && 'min-w-0',
)}
- onKeyDown={(event) => {
- if (!isKeyboardSelectEvent(event)) return
-
- event.preventDefault()
- onSelectProvider(collection.id)
- }}
onClick={() => onSelectProvider(collection.id)}
>
{useIntegrationsCard ? (
@@ -174,7 +165,7 @@ export function ToolProviderGrid({
}
/>
)}
- </div>
+ </button>
))}
{showWorkflowEmptyState && (
<div
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/monthly-days-selector.spec.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/monthly-days-selector.spec.tsx
index 854b6079e34..cf7d7937869 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/monthly-days-selector.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/monthly-days-selector.spec.tsx
@@ -11,6 +11,19 @@ describe('trigger-schedule/monthly-days-selector', () => {
).toBeInTheDocument()
})
+ it('exposes the selected days as pressed', () => {
+ render(<MonthlyDaysSelector selectedDays={[1, 'last']} onChange={vi.fn()} />)
+
+ expect(screen.getByRole('button', { name: '1', pressed: true })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: '2', pressed: false })).toBeInTheDocument()
+ expect(
+ screen.getByRole('button', {
+ name: 'workflowIntegrations.nodes.triggerSchedule.lastDay',
+ pressed: true,
+ }),
+ ).toBeInTheDocument()
+ })
+
it('toggles monthly days and shows the day-31 warning', async () => {
const user = userEvent.setup()
const onChange = vi.fn()
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/weekday-selector.spec.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/weekday-selector.spec.tsx
index 4992a047342..1c40e3751b3 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/weekday-selector.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/weekday-selector.spec.tsx
@@ -11,6 +11,14 @@ describe('trigger-schedule/weekday-selector', () => {
).toBeInTheDocument()
})
+ it('exposes the selected weekdays as pressed', () => {
+ render(<WeekdaySelector selectedDays={['mon', 'wed']} onChange={vi.fn()} />)
+
+ expect(screen.getByRole('button', { name: 'Mon', pressed: true })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Wed', pressed: true })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Tue', pressed: false })).toBeInTheDocument()
+ })
+
it('keeps at least one weekday selected', async () => {
const user = userEvent.setup()
const onChange = vi.fn()
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
index 841b35aca5d..afb60e56cfc 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
@@ -1,8 +1,13 @@
+import { cn } from '@langgenius/dify-ui/cn'
import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
import { Infotip, InfotipContent, InfotipTrigger } from '@langgenius/dify-ui/infotip'
+import { Toggle } from '@langgenius/dify-ui/toggle'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
+const dayToggleClassName =
+ 'rounded-lg border border-divider-subtle bg-components-option-card-option-bg py-1 text-xs text-text-tertiary outline-state-accent-solid transition-colors hover:border-divider-regular hover:text-text-secondary focus-visible:ring-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-solid data-pressed:border-util-colors-blue-brand-blue-brand-600 data-pressed:text-text-secondary data-pressed:hover:border-util-colors-blue-brand-blue-brand-600'
+
type MonthlyDaysSelectorProps = {
selectedDays: (number | 'last')[]
onChange: (days: (number | 'last')[]) => void
@@ -42,26 +47,19 @@ const MonthlyDaysSelector = ({ selectedDays, onChange }: MonthlyDaysSelectorProp
<div key={rowIndex} className="grid grid-cols-7 gap-1.5">
{row.map((day) =>
day === 'last' ? (
- <div
- key={day}
- className={`col-span-2 flex min-w-0 items-center rounded-lg border bg-components-option-card-option-bg text-xs transition-colors ${
- isDaySelected(day)
- ? 'border-util-colors-blue-brand-blue-brand-600 text-text-secondary'
- : 'border-divider-subtle text-text-tertiary hover:border-divider-regular hover:text-text-secondary'
- }`}
- >
- <button
+ <div key={day} className="relative col-span-2 min-w-0">
+ <Toggle
id={lastDayLabelId}
- type="button"
- onClick={() => handleDayClick(day)}
- className="min-w-0 flex-1 py-1"
+ pressed={isDaySelected(day)}
+ onPressedChange={() => handleDayClick(day)}
+ className={cn(dayToggleClassName, 'w-full pe-4')}
>
{t(($) => $['nodes.triggerSchedule.lastDay'], { ns: 'workflowIntegrations' })}
- </button>
+ </Toggle>
<Infotip>
<InfotipTrigger
aria-labelledby={lastDayLabelId}
- className="mr-1 size-3"
+ className="absolute inset-e-1 top-1/2 size-3 -translate-y-1/2"
iconSize="small"
/>
<InfotipContent aria-labelledby={lastDayLabelId}>
@@ -72,18 +70,14 @@ const MonthlyDaysSelector = ({ selectedDays, onChange }: MonthlyDaysSelectorProp
</Infotip>
</div>
) : (
- <button
+ <Toggle
key={day}
- type="button"
- onClick={() => handleDayClick(day)}
- className={`rounded-lg border bg-components-option-card-option-bg py-1 text-xs transition-colors ${
- isDaySelected(day)
- ? 'border-util-colors-blue-brand-blue-brand-600 text-text-secondary'
- : 'border-divider-subtle text-text-tertiary hover:border-divider-regular hover:text-text-secondary'
- }`}
+ pressed={isDaySelected(day)}
+ onPressedChange={() => handleDayClick(day)}
+ className={dayToggleClassName}
>
{day}
- </button>
+ </Toggle>
),
)}
{/* Fill empty cells in the last row (Last day takes 2 cols, so need 1 less) */}
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/weekday-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/weekday-selector.tsx
index d2278a57f8f..238b72a92f6 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/weekday-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/weekday-selector.tsx
@@ -1,4 +1,5 @@
import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset'
+import { Toggle } from '@langgenius/dify-ui/toggle'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
@@ -37,18 +38,14 @@ const WeekdaySelector = ({ selectedDays, onChange }: WeekdaySelectorProps) => {
</FieldsetLegend>
<div className="flex gap-1.5">
{weekdays.map((day) => (
- <button
+ <Toggle
key={day.key}
- type="button"
- className={`flex-1 rounded-lg border bg-components-option-card-option-bg py-1 text-xs transition-colors ${
- isDaySelected(day.key)
- ? 'border-util-colors-blue-brand-blue-brand-600 text-text-secondary'
- : 'border-divider-subtle text-text-tertiary hover:border-divider-regular hover:text-text-secondary'
- }`}
- onClick={() => handleDaySelect(day.key)}
+ pressed={isDaySelected(day.key)}
+ onPressedChange={() => handleDaySelect(day.key)}
+ className="flex-1 rounded-lg border border-divider-subtle bg-components-option-card-option-bg py-1 text-xs text-text-tertiary outline-state-accent-solid transition-colors hover:border-divider-regular hover:text-text-secondary focus-visible:ring-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-solid data-pressed:border-util-colors-blue-brand-blue-brand-600 data-pressed:text-text-secondary data-pressed:hover:border-util-colors-blue-brand-blue-brand-600"
>
{day.label}
- </button>
+ </Toggle>
))}
</div>
</Fieldset>
diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx
index bdfd58b4fe8..735da26b861 100644
--- a/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx
+++ b/web/app/components/workflow/note-node/note-editor/toolbar/command.tsx
@@ -1,4 +1,5 @@
import { cn } from '@langgenius/dify-ui/cn'
+import { Toggle } from '@langgenius/dify-ui/toggle'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { memo, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -67,6 +68,14 @@ const Command = ({ type }: CommandProps) => {
selectedIsBullet,
])
+ const pressed = {
+ bold: selectedIsBold,
+ italic: selectedIsItalic,
+ strikethrough: selectedIsStrikeThrough,
+ link: selectedIsLink,
+ bullet: selectedIsBullet,
+ }[type]
+
const tip = useMemo(() => {
switch (type) {
case 'bold':
@@ -86,21 +95,14 @@ const Command = ({ type }: CommandProps) => {
<Tooltip>
<TooltipTrigger
render={
- <button
- type="button"
+ <Toggle
aria-label={tip}
- className={cn(
- 'flex size-8 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-accent-active hover:text-text-accent',
- type === 'bold' && selectedIsBold && 'bg-state-accent-active',
- type === 'italic' && selectedIsItalic && 'bg-state-accent-active',
- type === 'strikethrough' && selectedIsStrikeThrough && 'bg-state-accent-active',
- type === 'link' && selectedIsLink && 'bg-state-accent-active',
- type === 'bullet' && selectedIsBullet && 'bg-state-accent-active',
- )}
- onClick={() => handleCommand(type)}
+ pressed={pressed}
+ onPressedChange={() => handleCommand(type)}
+ className="flex size-8 items-center justify-center rounded-md text-text-tertiary hover:bg-state-accent-active hover:text-text-accent data-pressed:bg-state-accent-active"
>
{icon}
- </button>
+ </Toggle>
}
/>
<TooltipContent>{tip}</TooltipContent>