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.

refactor(dify-ui): let overlay triggers own the focus indicator (#43657)

yyh1ed388d8657c
diff --git a/packages/dify-ui/src/collapsible/index.tsx b/packages/dify-ui/src/collapsible/index.tsx
index ad0eeabe742..f98a196f2a2 100644
--- a/packages/dify-ui/src/collapsible/index.tsx
+++ b/packages/dify-ui/src/collapsible/index.tsx
@@ -4,6 +4,7 @@ import type { Collapsible as BaseCollapsibleNS } from '@base-ui/react/collapsibl
import { Collapsible as BaseCollapsible } from '@base-ui/react/collapsible'
import { cn } from '../cn'
import { resolveClassName } from '../internals/resolve-class-name'
+import { triggerFocusClassName } from '../overlay-shared'
type CollapsibleProps = BaseCollapsibleNS.Root.Props
function Collapsible({ className, ...props }: CollapsibleProps) {
@@ -15,8 +16,15 @@ function Collapsible({ className, ...props }: CollapsibleProps) {
)
}
-const CollapsibleTrigger = BaseCollapsible.Trigger
type CollapsibleTriggerProps = BaseCollapsibleNS.Trigger.Props
+function CollapsibleTrigger({ className, ...props }: CollapsibleTriggerProps) {
+ return (
+ <BaseCollapsible.Trigger
+ className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
type CollapsiblePanelProps = BaseCollapsibleNS.Panel.Props
function CollapsiblePanel({ className, ...props }: CollapsiblePanelProps) {
diff --git a/packages/dify-ui/src/combobox/index.tsx b/packages/dify-ui/src/combobox/index.tsx
index 20d43a018b5..caeaa2d1d94 100644
--- a/packages/dify-ui/src/combobox/index.tsx
+++ b/packages/dify-ui/src/combobox/index.tsx
@@ -13,6 +13,7 @@ import {
floatingItemIndicatorClassName,
floatingPopupAnimationClassName,
floatingSeparatorClassName,
+ triggerFocusClassName,
} from '../overlay-shared'
import { parsePlacement } from '../placement'
@@ -98,12 +99,7 @@ function ComboboxTrigger({ className, type = 'button', ...props }: ComboboxTrigg
return (
<BaseCombobox.Trigger
type={type}
- className={(state) =>
- cn(
- 'outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid',
- resolveClassName(className, state),
- )
- }
+ className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}
{...props}
/>
)
diff --git a/packages/dify-ui/src/date-time/internal/picker-parts.tsx b/packages/dify-ui/src/date-time/internal/picker-parts.tsx
index 72f98ada129..c31ca9eb39c 100644
--- a/packages/dify-ui/src/date-time/internal/picker-parts.tsx
+++ b/packages/dify-ui/src/date-time/internal/picker-parts.tsx
@@ -282,7 +282,7 @@ function PickerTrigger({
className={(state) =>
cn(
'flex h-8 w-63 max-w-full items-center justify-between gap-0.5 rounded-lg bg-components-input-bg-normal ps-3 pe-2 text-start system-sm-regular text-components-input-text-filled',
- 'hover:bg-state-base-hover-alt focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-state-accent-solid data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-popup-open:bg-state-base-hover-alt',
+ 'hover:bg-state-base-hover-alt data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-popup-open:bg-state-base-hover-alt',
!field.serializedValue && 'text-text-tertiary in-data-[theme=dark]:text-text-secondary',
resolveClassName(className, state),
)
diff --git a/packages/dify-ui/src/dropdown-menu/index.stories.tsx b/packages/dify-ui/src/dropdown-menu/index.stories.tsx
index 1b26ed18300..adb5246f02f 100644
--- a/packages/dify-ui/src/dropdown-menu/index.stories.tsx
+++ b/packages/dify-ui/src/dropdown-menu/index.stories.tsx
@@ -27,7 +27,7 @@ function TriggerButton({ label = 'Open Menu' }: { label?: string }) {
render={
<button
type="button"
- className="rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="rounded-lg border border-divider-subtle bg-components-button-secondary-bg px-3 py-1.5 text-sm text-text-secondary shadow-xs hover:bg-state-base-hover"
/>
}
>
@@ -359,7 +359,7 @@ function DetachedTriggerDemo() {
<DropdownMenuTrigger
handle={handle}
payload={{ name: 'Report' }}
- className="rounded-lg border border-divider-subtle px-3 py-1.5 focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="rounded-lg border border-divider-subtle px-3 py-1.5"
>
Report actions
</DropdownMenuTrigger>
diff --git a/packages/dify-ui/src/dropdown-menu/index.tsx b/packages/dify-ui/src/dropdown-menu/index.tsx
index dc0fa0d46ed..9a8447a526a 100644
--- a/packages/dify-ui/src/dropdown-menu/index.tsx
+++ b/packages/dify-ui/src/dropdown-menu/index.tsx
@@ -15,12 +15,12 @@ import {
menuItemDestructiveClassName,
menuPopupBaseClassName,
menuPopupSurfaceClassName,
+ triggerFocusClassName,
} from '../overlay-shared'
import { parsePlacement } from '../placement'
const DropdownMenu = Menu.Root
const DropdownMenuPortal = Menu.Portal
-const DropdownMenuTrigger = Menu.Trigger
const DropdownMenuSub = Menu.SubmenuRoot
const DropdownMenuGroup = Menu.Group
const createDropdownMenuHandle = Menu.createHandle
@@ -31,6 +31,18 @@ type DropdownMenuActions = Menu.Root.Actions
type DropdownMenuProps<Payload = unknown> = Menu.Root.Props<Payload>
type DropdownMenuTriggerProps<Payload = unknown> = Menu.Trigger.Props<Payload>
+
+function DropdownMenuTrigger<Payload = unknown>({
+ className,
+ ...props
+}: DropdownMenuTriggerProps<Payload>) {
+ return (
+ <Menu.Trigger
+ className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
type DropdownMenuPortalProps = Menu.Portal.Props
type DropdownMenuSubProps = Menu.SubmenuRoot.Props
type DropdownMenuGroupProps = Menu.Group.Props
diff --git a/packages/dify-ui/src/overlay-shared.ts b/packages/dify-ui/src/overlay-shared.ts
index c87e20ff678..6a6bcae8777 100644
--- a/packages/dify-ui/src/overlay-shared.ts
+++ b/packages/dify-ui/src/overlay-shared.ts
@@ -1,5 +1,9 @@
export type MenuItemVariant = 'default' | 'destructive'
+// The focus indicator a trigger owns. The caller owns the appearance, directly or through `render`.
+export const triggerFocusClassName =
+ 'outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid'
+
export const menuItemClassName =
'mx-1 flex h-8 cursor-pointer select-none items-center gap-1 rounded-lg px-2 outline-hidden data-highlighted:bg-state-base-hover data-disabled:cursor-not-allowed data-disabled:opacity-30'
export const menuItemDestructiveClassName =
diff --git a/packages/dify-ui/src/popover/index.tsx b/packages/dify-ui/src/popover/index.tsx
index 0dda248fdf3..34c78011d4d 100644
--- a/packages/dify-ui/src/popover/index.tsx
+++ b/packages/dify-ui/src/popover/index.tsx
@@ -5,13 +5,12 @@ import type { Placement } from '../placement'
import { Popover as BasePopover } from '@base-ui/react/popover'
import { cn } from '../cn'
import { resolveClassName } from '../internals/resolve-class-name'
-import { floatingPopupAnimationClassName } from '../overlay-shared'
+import { floatingPopupAnimationClassName, triggerFocusClassName } from '../overlay-shared'
import { parsePlacement } from '../placement'
const Popover = BasePopover.Root
const PopoverArrow = BasePopover.Arrow
const PopoverPortal = BasePopover.Portal
-const PopoverTrigger = BasePopover.Trigger
const PopoverClose = BasePopover.Close
const PopoverTitle = BasePopover.Title
const PopoverDescription = BasePopover.Description
@@ -24,6 +23,15 @@ type PopoverArrowProps = BasePopover.Arrow.Props
type PopoverPortalProps = BasePopover.Portal.Props
type PopoverHandle<Payload = unknown> = BasePopover.Handle<Payload>
type PopoverTriggerProps<Payload = unknown> = BasePopover.Trigger.Props<Payload>
+
+function PopoverTrigger<Payload = unknown>({ className, ...props }: PopoverTriggerProps<Payload>) {
+ return (
+ <BasePopover.Trigger
+ className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
type PopoverCloseProps = BasePopover.Close.Props
type PopoverTitleProps = BasePopover.Title.Props
type PopoverDescriptionProps = BasePopover.Description.Props
diff --git a/web/app/account/(commonLayout)/avatar.tsx b/web/app/account/(commonLayout)/avatar.tsx
index 6d14e67bd8e..eb499f5ddad 100644
--- a/web/app/account/(commonLayout)/avatar.tsx
+++ b/web/app/account/(commonLayout)/avatar.tsx
@@ -40,8 +40,8 @@ export default function AppSelector() {
<DropdownMenuTrigger
aria-label={userProfile.name}
className={cn(
- 'inline-flex size-8 items-center justify-center rounded-full border-none bg-transparent p-0 text-sm text-text-primary outline-hidden',
- 'hover:opacity-80 focus-visible:ring-1 focus-visible:ring-components-input-border-hover active:opacity-70 data-popup-open:opacity-80',
+ 'inline-flex size-8 items-center justify-center rounded-full border-none bg-transparent p-0 text-sm text-text-primary',
+ 'hover:opacity-80 active:opacity-70 data-popup-open:opacity-80',
)}
>
<Avatar avatar={userProfile.avatar_url} name={userProfile.name} />
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 3bb90463529..ad898950dae 100644
--- a/web/app/components/app/app-publisher/environment-tabs/index.tsx
+++ b/web/app/components/app/app-publisher/environment-tabs/index.tsx
@@ -150,8 +150,8 @@ export function PublisherEnvironmentTabs({
type="button"
aria-current={selectedOverflowEnvironment ? 'true' : undefined}
className={cn(
- 'flex h-7 min-w-0 items-center justify-center gap-0.5 rounded-lg px-2 py-1.5 system-sm-medium text-text-tertiary outline-hidden',
- 'hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+ 'flex h-7 min-w-0 items-center justify-center gap-0.5 rounded-lg px-2 py-1.5 system-sm-medium text-text-tertiary',
+ 'hover:bg-state-base-hover',
!showMoreEnvironmentsLabel && 'max-w-22 shrink-0',
selectedOverflowEnvironment &&
'bg-state-base-active system-sm-semibold text-text-primary',
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
index 389cb150cea..7336c90330a 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
@@ -284,7 +284,7 @@ const AgentTools: FC = () => {
render={
<button
type="button"
- className="mr-1 cursor-pointer rounded-md p-1 outline-hidden hover:bg-black/5 focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+ className="mr-1 cursor-pointer rounded-md p-1 hover:bg-black/5"
>
<span
aria-hidden
diff --git a/web/app/components/app/configuration/config/automatic/idea-output.tsx b/web/app/components/app/configuration/config/automatic/idea-output.tsx
index 4ff5a030ce4..66189d40f6e 100644
--- a/web/app/components/app/configuration/config/automatic/idea-output.tsx
+++ b/web/app/components/app/configuration/config/automatic/idea-output.tsx
@@ -17,7 +17,7 @@ const IdeaOutput: FC<Props> = ({ value, onChange }) => {
return (
<Collapsible className="mt-4 text-[0px]">
- <CollapsibleTrigger className="group mb-1.5 flex cursor-pointer flex-wrap items-center text-left text-sm/5 font-medium text-text-primary focus-visible:ring-2 focus-visible:ring-components-input-border-active focus-visible:outline-hidden">
+ <CollapsibleTrigger className="group mb-1.5 flex cursor-pointer flex-wrap items-center text-left text-sm/5 font-medium text-text-primary">
<span className="mr-1 system-sm-semibold-uppercase text-text-secondary">
{t(($) => $[`${i18nPrefix}.idealOutput`], { ns: 'appGeneration' })}
</span>
diff --git a/web/app/components/app/configuration/configuration-view/legacy-agent-badge.tsx b/web/app/components/app/configuration/configuration-view/legacy-agent-badge.tsx
index 7253db00da0..27ccddc906a 100644
--- a/web/app/components/app/configuration/configuration-view/legacy-agent-badge.tsx
+++ b/web/app/components/app/configuration/configuration-view/legacy-agent-badge.tsx
@@ -15,7 +15,7 @@ export function LegacyAgentBadge() {
delay={300}
closeDelay={200}
type="button"
- className="inline-flex h-5 shrink-0 cursor-pointer items-center gap-0.5 rounded-[5px] border border-text-warning bg-components-badge-bg-dimm px-1.25 system-2xs-medium-uppercase whitespace-nowrap text-text-warning outline-hidden hover:bg-state-warning-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="inline-flex h-5 shrink-0 cursor-pointer items-center gap-0.5 rounded-[5px] border border-text-warning bg-components-badge-bg-dimm px-1.25 system-2xs-medium-uppercase whitespace-nowrap text-text-warning hover:bg-state-warning-hover"
>
<span aria-hidden className="i-ri-alert-fill size-3 shrink-0" />
{t(($) => $['legacyAgentBadge.label'], { ns: 'appDebug' })}
diff --git a/web/app/components/app/deploy/shared/deployment-configuration/workflow-source-popover.tsx b/web/app/components/app/deploy/shared/deployment-configuration/workflow-source-popover.tsx
index 5468c02673c..4ac6cfb05b1 100644
--- a/web/app/components/app/deploy/shared/deployment-configuration/workflow-source-popover.tsx
+++ b/web/app/components/app/deploy/shared/deployment-configuration/workflow-source-popover.tsx
@@ -122,7 +122,7 @@ export function WorkflowDependencyPreview({
render={
<button
type="button"
- className="group/source flex min-w-0 shrink-0 cursor-help items-center gap-1 rounded-sm outline-hidden focus-visible:ring-1 focus-visible:ring-state-accent-solid"
+ className="group/source flex min-w-0 shrink-0 cursor-help items-center gap-1 rounded-sm"
>
<span className="sr-only">{subjectName}: </span>
<span className="shrink-0 system-xs-regular text-text-tertiary">
@@ -160,7 +160,7 @@ export function SubworkflowSourceTitle({ source }: { source: WorkflowAsToolSourc
render={
<button
type="button"
- className="group/source max-w-full min-w-0 cursor-help truncate rounded-sm border-b border-dotted border-text-quaternary text-start system-sm-semibold text-text-primary outline-hidden hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-state-accent-solid data-popup-open:text-text-secondary"
+ className="group/source max-w-full min-w-0 cursor-help truncate rounded-sm border-b border-dotted border-text-quaternary text-start system-sm-semibold text-text-primary hover:text-text-secondary data-popup-open:text-text-secondary"
>
{workflow.name}
</button>
diff --git a/web/app/components/app/deploy/shared/version-label.tsx b/web/app/components/app/deploy/shared/version-label.tsx
index cd68f484c66..002d8557640 100644
--- a/web/app/components/app/deploy/shared/version-label.tsx
+++ b/web/app/components/app/deploy/shared/version-label.tsx
@@ -49,7 +49,7 @@ export function VersionLabel({
render={
<button
type="button"
- className="min-w-0 cursor-help truncate border-b border-dotted border-text-quaternary system-md-medium text-text-secondary outline-hidden focus-visible:ring-1 focus-visible:ring-state-accent-solid"
+ className="min-w-0 cursor-help truncate border-b border-dotted border-text-quaternary system-md-medium text-text-secondary"
>
{name}
</button>
diff --git a/web/app/components/apps/app-sort-filter.tsx b/web/app/components/apps/app-sort-filter.tsx
index 1cda36e7d19..19cc69d61c6 100644
--- a/web/app/components/apps/app-sort-filter.tsx
+++ b/web/app/components/apps/app-sort-filter.tsx
@@ -44,7 +44,7 @@ export function AppSortFilter({ value, onChange }: AppSortFilterProps) {
return (
<DropdownMenu>
- <DropdownMenuTrigger className="flex h-8 cursor-pointer items-center rounded-lg border-none bg-components-input-bg-normal py-1 pr-2.5 pl-2 text-left whitespace-nowrap outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover">
+ <DropdownMenuTrigger className="flex h-8 cursor-pointer items-center rounded-lg border-none bg-components-input-bg-normal py-1 pr-2.5 pl-2 text-left whitespace-nowrap hover:bg-state-base-hover data-popup-open:bg-state-base-hover">
<span className="flex items-center gap-1 p-1 text-[13px] leading-4 whitespace-nowrap">
<span className="font-normal text-text-tertiary">{sortByLabel}</span>{' '}
<span className="font-medium text-text-secondary">{activeOption.text}</span>
diff --git a/web/app/components/apps/app-type-filter.tsx b/web/app/components/apps/app-type-filter.tsx
index 06f2704df8e..7d19e0a6ac2 100644
--- a/web/app/components/apps/app-type-filter.tsx
+++ b/web/app/components/apps/app-type-filter.tsx
@@ -17,7 +17,7 @@ import { studioAppListCategories } from './query-params'
type AppListCategory = AppListUrlQuery['category']
const chipClassName =
- 'flex h-8 items-center whitespace-nowrap rounded-lg border-[0.5px] px-2 text-[13px] leading-4 outline-hidden transition-colors focus-visible:ring-2 focus-visible:ring-state-accent-solid'
+ 'flex h-8 items-center whitespace-nowrap rounded-lg border-[0.5px] px-2 text-[13px] leading-4 transition-colors'
type AppTypeFilterProps = {
value: AppListCategory
diff --git a/web/app/components/base/chat/chat-with-history/header/operation.tsx b/web/app/components/base/chat/chat-with-history/header/operation.tsx
index 2cb22a28f6f..fcb7045ee8d 100644
--- a/web/app/components/base/chat/chat-with-history/header/operation.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/operation.tsx
@@ -36,7 +36,7 @@ const Operation: FC<Props> = ({
return (
<DropdownMenu>
- <DropdownMenuTrigger className="flex cursor-pointer items-center rounded-lg border-none bg-transparent p-1.5 pl-2 text-text-secondary outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover">
+ <DropdownMenuTrigger className="flex cursor-pointer items-center rounded-lg border-none bg-transparent p-1.5 pl-2 text-text-secondary hover:bg-state-base-hover data-popup-open:bg-state-base-hover">
<span className="system-md-semibold">{title}</span>
<span aria-hidden className="i-ri-arrow-down-s-line size-4" />
</DropdownMenuTrigger>
diff --git a/web/app/components/base/chat/chat/answer/agent-roster-response-content.tsx b/web/app/components/base/chat/chat/answer/agent-roster-response-content.tsx
index d916af14325..a7088630761 100644
--- a/web/app/components/base/chat/chat/answer/agent-roster-response-content.tsx
+++ b/web/app/components/base/chat/chat/answer/agent-roster-response-content.tsx
@@ -217,7 +217,7 @@ function ToolActivityItem({ tool }: { tool: ToolActivity }) {
<div className="flex w-full max-w-full min-w-0 flex-col items-start">
{hasDetails ? (
<Collapsible className="w-full max-w-full items-start">
- <CollapsibleTrigger className="group/tool flex h-6 min-h-0 max-w-full touch-manipulation items-center justify-start gap-0 rounded-md p-1 text-left system-xs-medium text-text-tertiary outline-hidden select-none hover:bg-state-base-hover hover:text-text-primary focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-panel-open:text-text-primary">
+ <CollapsibleTrigger className="group/tool flex h-6 min-h-0 max-w-full touch-manipulation items-center justify-start gap-0 rounded-md p-1 text-left system-xs-medium text-text-tertiary select-none hover:bg-state-base-hover hover:text-text-primary focus-visible:bg-state-base-hover data-panel-open:text-text-primary">
{content}
</CollapsibleTrigger>
<CollapsiblePanel className="w-full max-w-full">
@@ -308,7 +308,7 @@ function AgentActivityDisclosure({
<Collapsible className="w-full max-w-full items-start gap-1" defaultOpen={defaultOpen}>
<CollapsibleTrigger
aria-label={title}
- className="group/thinking flex h-6 min-h-0 max-w-full touch-manipulation items-center justify-start gap-1 rounded-md p-1 text-left system-xs-medium text-text-tertiary outline-hidden select-none hover:bg-state-base-hover hover:text-text-primary focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-panel-open:text-text-primary"
+ className="group/thinking flex h-6 min-h-0 max-w-full touch-manipulation items-center justify-start gap-1 rounded-md p-1 text-left system-xs-medium text-text-tertiary select-none hover:bg-state-base-hover hover:text-text-primary focus-visible:bg-state-base-hover data-panel-open:text-text-primary"
>
<span>{thinking}</span>
{duration && (
diff --git a/web/app/components/base/sort/index.tsx b/web/app/components/base/sort/index.tsx
index 404f1a9fbce..1d13fc15691 100644
--- a/web/app/components/base/sort/index.tsx
+++ b/web/app/components/base/sort/index.tsx
@@ -33,7 +33,7 @@ function Sort({ order, value, items, onSelect }: Props) {
<div className="inline-flex max-w-full min-w-0 items-center gap-px">
<DropdownMenu>
<div className="relative min-w-0 flex-1">
- <DropdownMenuTrigger className="flex min-h-8 min-w-0 cursor-pointer items-center rounded-l-lg border-none bg-components-input-bg-normal px-2 py-1 outline-hidden hover:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover-alt! data-popup-open:hover:bg-state-base-hover-alt">
+ <DropdownMenuTrigger className="flex min-h-8 min-w-0 cursor-pointer items-center rounded-l-lg border-none bg-components-input-bg-normal px-2 py-1 hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt! data-popup-open:hover:bg-state-base-hover-alt">
<div className="flex min-w-0 items-center gap-0.5 px-1">
<div className="system-sm-regular text-text-tertiary">
{t(($) => $['filter.sortBy'], { ns: 'appLog' })}
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
index 18899094264..a113bdfb000 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
@@ -48,7 +48,7 @@ const Actions = ({
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
className={cn(
'flex size-8 cursor-pointer items-center justify-center rounded-lg p-0 shadow-xs shadow-shadow-shadow-3',
- 'outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover',
+ 'data-popup-open:bg-state-base-hover',
)}
onClick={(e) => e.stopPropagation()}
>
diff --git a/web/app/components/datasets/external-api/external-api-modal/index.tsx b/web/app/components/datasets/external-api/external-api-modal/index.tsx
index 945c32e7510..7c098932c81 100644
--- a/web/app/components/datasets/external-api/external-api-modal/index.tsx
+++ b/web/app/components/datasets/external-api/external-api-modal/index.tsx
@@ -162,7 +162,7 @@ const AddExternalAPIModal: FC<AddExternalAPIModalProps> = ({
render={
<button
type="button"
- className="flex size-3.5 items-center justify-center rounded-sm outline-hidden hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+ className="flex size-3.5 items-center justify-center rounded-sm hover:bg-state-base-hover"
>
<RiInformation2Line className="size-3.5" />
</button>
diff --git a/web/app/components/datasets/extra-info/api-access/index.tsx b/web/app/components/datasets/extra-info/api-access/index.tsx
index 720815db2d9..0821af1dd75 100644
--- a/web/app/components/datasets/extra-info/api-access/index.tsx
+++ b/web/app/components/datasets/extra-info/api-access/index.tsx
@@ -25,7 +25,7 @@ const ApiAccess = ({ expand, apiEnabled }: ApiAccessProps) => {
type="button"
aria-label={!expand ? t(($) => $['appMenus.apiAccess'], { ns: 'common' }) : undefined}
className={cn(
- 'nokey w-full rounded-lg border-none bg-transparent p-0 text-left focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-state-accent-solid',
+ 'nokey w-full rounded-lg border-none bg-transparent p-0 text-left',
props.className,
)}
>
diff --git a/web/app/components/datasets/extra-info/statistics.tsx b/web/app/components/datasets/extra-info/statistics.tsx
index deaafe7598c..524029bcff7 100644
--- a/web/app/components/datasets/extra-info/statistics.tsx
+++ b/web/app/components/datasets/extra-info/statistics.tsx
@@ -42,7 +42,7 @@ const Statistics = ({ expand, documentCount, relatedApps }: StatisticsProps) =>
render={
<button
type="button"
- className="flex max-w-full cursor-pointer items-center gap-x-0.5 rounded-sm system-2xs-medium-uppercase text-text-tertiary outline-hidden hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+ className="flex max-w-full cursor-pointer items-center gap-x-0.5 rounded-sm system-2xs-medium-uppercase text-text-tertiary hover:text-text-secondary"
>
<span className="truncate">
{t(($) => $['datasetMenus.relatedApp'], { ns: 'common' })}
diff --git a/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx b/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
index ca2ab36e5d4..dd38777f850 100644
--- a/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
@@ -96,7 +96,7 @@ const OperationsDropdown = ({
'inline-flex size-9 cursor-pointer items-center justify-center rounded-[10px] border-[0.5px]',
'border-components-actionbar-border bg-components-button-secondary-bg p-0 shadow-lg inset-ring-2 shadow-shadow-shadow-5 inset-ring-components-button-secondary-bg',
'transition-colors hover:border-components-actionbar-border hover:bg-state-base-hover',
- 'focus-visible:bg-state-base-hover focus-visible:inset-ring-1 focus-visible:inset-ring-components-input-border-hover focus-visible:outline-hidden',
+ 'focus-visible:bg-state-base-hover',
'data-popup-open:bg-state-base-hover',
)}
aria-label="Dataset operations"
diff --git a/web/app/components/datasets/settings/permission-selector/index.tsx b/web/app/components/datasets/settings/permission-selector/index.tsx
index 12de9c4f491..f9a621ac828 100644
--- a/web/app/components/datasets/settings/permission-selector/index.tsx
+++ b/web/app/components/datasets/settings/permission-selector/index.tsx
@@ -85,7 +85,7 @@ const PermissionSelector = ({
aria-labelledby={labelledBy ? `${labelledBy} ${triggerId}` : undefined}
disabled={isDisabled}
className={cn(
- 'group/permission-trigger flex w-full cursor-pointer touch-manipulation items-center gap-x-0.5 rounded-lg bg-components-input-bg-normal px-2 py-1 text-left outline-hidden hover:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover-alt',
+ 'group/permission-trigger flex w-full cursor-pointer touch-manipulation items-center gap-x-0.5 rounded-lg bg-components-input-bg-normal px-2 py-1 text-left hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt',
'data-disabled:cursor-not-allowed! data-disabled:bg-components-input-bg-disabled! data-disabled:hover:bg-components-input-bg-disabled!',
)}
>
diff --git a/web/app/components/explore/item-operation/index.tsx b/web/app/components/explore/item-operation/index.tsx
index 5349ac1857d..ca6e403c417 100644
--- a/web/app/components/explore/item-operation/index.tsx
+++ b/web/app/components/explore/item-operation/index.tsx
@@ -35,7 +35,7 @@ function ItemOperation({
<DropdownMenuTrigger
aria-label={tCommon(($) => $['operation.moreActionsFor'], { name: itemName })}
className={cn(
- 'group/operation flex size-6 items-center justify-center rounded-md border-none p-0 text-text-tertiary transition-colors group-focus-within:bg-components-actionbar-bg! group-hover:bg-components-actionbar-bg! hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-popup-open:bg-components-actionbar-bg! data-popup-open:shadow-none!',
+ 'group/operation flex size-6 items-center justify-center rounded-md border-none p-0 text-text-tertiary transition-colors group-focus-within:bg-components-actionbar-bg! group-hover:bg-components-actionbar-bg! hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-components-actionbar-bg! data-popup-open:shadow-none!',
className,
)}
onClick={(e) => {
diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx
index 159f2570ebb..57cd791eeb9 100644
--- a/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx
@@ -100,7 +100,7 @@ const AccessRuleSection = ({
}
>
<div className="flex items-center gap-4 p-4">
- <CollapsibleTrigger className="flex min-h-0 min-w-0 flex-1 touch-manipulation items-center justify-start gap-0 text-start system-sm-medium text-text-secondary outline-hidden select-none hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid data-panel-open:text-text-primary">
+ <CollapsibleTrigger className="flex min-h-0 min-w-0 flex-1 touch-manipulation items-center justify-start gap-0 text-start system-sm-medium text-text-secondary select-none hover:text-text-primary data-panel-open:text-text-primary">
<div className="flex min-w-0 items-center gap-4">
<span className="truncate system-sm-semibold text-text-primary">{title}</span>
<span className="shrink-0 system-xs-regular text-text-tertiary">
diff --git a/web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsx b/web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsx
index d908e114e72..af63404d90a 100644
--- a/web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsx
+++ b/web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsx
@@ -53,7 +53,7 @@ const PermissionRoleChip = ({
render={
<button
type="button"
- className="min-w-0 truncate rounded-sm border-none bg-transparent p-0 text-start leading-4 outline-hidden"
+ className="min-w-0 truncate rounded-sm border-none bg-transparent p-0 text-start leading-4"
>
{label}
</button>
diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
index 0d2bf292f6f..5f2614c6213 100644
--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
@@ -49,7 +49,7 @@ const MemberSelector: FC<Props> = ({ value, onSelect, exclude = [] }) => {
render={
<button
type="button"
- className="group flex cursor-pointer appearance-none items-center gap-1.5 rounded-lg bg-components-input-bg-normal px-2 py-1 text-start outline-hidden hover:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover-alt"
+ className="group flex cursor-pointer appearance-none items-center gap-1.5 rounded-lg bg-components-input-bg-normal px-2 py-1 text-start hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt"
/>
}
>
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
index 9a5269359c0..f6e8a78c652 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
@@ -46,7 +46,7 @@ const CredentialSelector = ({
render={
<button
type="button"
- className="flex h-8 w-full items-center justify-between rounded-lg bg-components-input-bg-normal px-2 text-left system-sm-regular focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-state-accent-solid"
+ className="flex h-8 w-full items-center justify-between rounded-lg bg-components-input-bg-normal px-2 text-left system-sm-regular"
/>
}
>
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx
index 961b3488827..5dfa31226aa 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx
@@ -47,7 +47,7 @@ function MarketplaceSection({
<div className="flex h-5.5 items-center pr-2 pl-4">
<CollapsibleTrigger
id={headingId}
- className="group/marketplace flex min-h-0 w-full flex-1 touch-manipulation items-center justify-start gap-0 text-start system-sm-medium text-text-primary outline-hidden select-none focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="group/marketplace flex min-h-0 w-full flex-1 touch-manipulation items-center justify-start gap-0 text-start system-sm-medium text-text-primary select-none"
>
{t(($) => $['modelProvider.selector.fromMarketplace'], { ns: 'modelProvider' })}
<span
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
index 81c922d3c38..bc2828eecac 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
@@ -122,8 +122,8 @@ function ModelSelectorTrigger({
data-surface={surface}
disabled={isDisabled}
className={cn(
- 'group/model-selector-trigger flex w-full min-w-0 items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden transition-colors',
- 'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover-alt',
+ 'group/model-selector-trigger flex w-full min-w-0 items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled transition-colors',
+ 'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt',
'disabled:cursor-not-allowed disabled:text-components-input-text-filled-disabled motion-reduce:transition-none',
'data-[size=small]:h-6 data-[size=small]:gap-px data-[size=small]:rounded-md data-[size=small]:p-0.5',
'data-[size=medium]:h-8 data-[size=medium]:gap-0.5 data-[size=medium]:rounded-lg data-[size=medium]:p-1',
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
index 613bffc24a4..8fb2b24db3c 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
@@ -129,7 +129,7 @@ function PopupItem({
<div className="sticky top-0 z-1 flex min-h-5.5 min-w-0 items-center justify-between gap-2 bg-components-panel-bg px-3 text-xs font-medium text-text-tertiary">
<CollapsibleTrigger
id={providerHeadingId}
- className="group/provider flex min-h-0 min-w-0 touch-manipulation items-center justify-start gap-0 text-xs font-medium text-text-tertiary outline-hidden select-none focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="group/provider flex min-h-0 min-w-0 touch-manipulation items-center justify-start gap-0 text-xs font-medium text-text-tertiary select-none"
>
<span className="truncate">{providerLabel}</span>
<span
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
index 202259df4b6..4e4da9e85a4 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/quota-panel.tsx
@@ -52,7 +52,7 @@ const QuotaInfotip: FC<QuotaInfotipProps> = ({ tipText }) => {
closeDelay={200}
aria-label={tipText}
onClick={handleClick}
- className="ml-0.5 inline-flex size-3 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0 outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="ml-0.5 inline-flex size-3 shrink-0 cursor-pointer items-center justify-center rounded-sm border-0 bg-transparent p-0"
>
<span
aria-hidden
diff --git a/web/app/components/main-nav/components/help-menu.tsx b/web/app/components/main-nav/components/help-menu.tsx
index ef079913718..d8d32616102 100644
--- a/web/app/components/main-nav/components/help-menu.tsx
+++ b/web/app/components/main-nav/components/help-menu.tsx
@@ -158,6 +158,7 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
<DropdownMenuTrigger
ref={triggerRef}
data-learn-dify-help-target
+ className="focus-visible:ring-0"
render={
<IconButton
size={triggerSize ?? 'lg'}
diff --git a/web/app/components/main-nav/components/web-apps-section.tsx b/web/app/components/main-nav/components/web-apps-section.tsx
index c1e6f8553d9..28ef7e0a59b 100644
--- a/web/app/components/main-nav/components/web-apps-section.tsx
+++ b/web/app/components/main-nav/components/web-apps-section.tsx
@@ -191,7 +191,7 @@ const WebAppsSectionContent = () => {
onOpenChange={setAppsExpanded}
className="grid min-h-0 flex-1 grid-cols-[minmax(0,1fr)_auto] grid-rows-[auto_auto_minmax(0,1fr)]"
>
- <CollapsibleTrigger className="group/collapsible col-start-1 row-start-1 my-1 ml-2 flex min-h-6 w-fit min-w-0 touch-manipulation items-center justify-start gap-0 rounded-md px-2 py-1 text-left system-sm-medium text-text-tertiary outline-hidden select-none hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid">
+ <CollapsibleTrigger className="group/collapsible col-start-1 row-start-1 my-1 ml-2 flex min-h-6 w-fit min-w-0 touch-manipulation items-center justify-start gap-0 rounded-md px-2 py-1 text-left system-sm-medium text-text-tertiary select-none hover:text-text-secondary">
<span id={sectionLabelId} className="system-xs-medium-uppercase">
{t(($) => $['sidebar.webApps'], { ns: 'explore' })}
</span>
diff --git a/web/app/components/main-nav/components/workspace-card.tsx b/web/app/components/main-nav/components/workspace-card.tsx
index ec239465c10..eaa713ff734 100644
--- a/web/app/components/main-nav/components/workspace-card.tsx
+++ b/web/app/components/main-nav/components/workspace-card.tsx
@@ -125,7 +125,7 @@ function WorkspaceCardTrigger({
onMouseEnter={onPrefetchWorkspaces}
onFocus={onPrefetchWorkspaces}
className={cn(
- 'flex w-full items-center gap-1.5 py-1.5 pr-3 pl-1.5 text-left transition-colors hover:bg-state-base-hover focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid focus-visible:outline-hidden',
+ 'flex w-full items-center gap-1.5 py-1.5 pr-3 pl-1.5 text-left transition-colors hover:bg-state-base-hover focus-visible:ring-0 focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',
showCloudBilling ? 'rounded-t-xl' : 'rounded-xl',
'data-popup-open:bg-linear-to-b data-popup-open:from-background-section-burn data-popup-open:to-background-section',
)}
diff --git a/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx b/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx
index 9601f1596c8..0cc10e7678d 100644
--- a/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx
+++ b/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx
@@ -164,7 +164,7 @@ export default function CreatorContent({
<DropdownMenu>
<DropdownMenuTrigger
aria-label={`${t(($) => $['marketplace.creatorProfile.sortBy'], { ns: 'plugin' })} ${selectedSort.label}`}
- className="flex h-8 items-center rounded-lg px-2 outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="flex h-8 items-center rounded-lg px-2 hover:bg-state-base-hover"
>
<span className="mr-1 system-sm-regular text-text-tertiary">
{t(($) => $['marketplace.creatorProfile.sortBy'], { ns: 'plugin' })}
diff --git a/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx b/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx
index 239461998f9..34aa0ca936a 100644
--- a/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx
@@ -41,7 +41,7 @@ const PermissionSelector = ({ disabled, permission, onChange }: PermissionSelect
aria-label={`${permissionLabel}: ${selectedPermissionLabel}`}
disabled={disabled}
className={cn(
- 'group/permission-trigger flex w-full cursor-pointer touch-manipulation items-center gap-x-0.5 rounded-lg bg-components-input-bg-normal px-2 py-1 text-left outline-hidden hover:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover-alt',
+ 'group/permission-trigger flex w-full cursor-pointer touch-manipulation items-center gap-x-0.5 rounded-lg bg-components-input-bg-normal px-2 py-1 text-left hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt',
'data-disabled:cursor-not-allowed! data-disabled:bg-components-input-bg-disabled! data-disabled:hover:bg-components-input-bg-disabled!',
)}
>
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
index 8ecde1b95d1..21bc56b0afc 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
@@ -122,7 +122,7 @@ export function AppSelector({ value, disabled, offset = 4, onSelect }: AppSelect
{...props}
type="button"
className={cn(
- 'block w-full rounded-lg border-0 bg-transparent p-0 text-left outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+ 'block w-full rounded-lg border-0 bg-transparent p-0 text-left',
props.className,
)}
>
diff --git a/web/app/components/plugins/plugin-detail-panel/endpoint-list.tsx b/web/app/components/plugins/plugin-detail-panel/endpoint-list.tsx
index 183b2d1a394..22a364a3727 100644
--- a/web/app/components/plugins/plugin-detail-panel/endpoint-list.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/endpoint-list.tsx
@@ -58,7 +58,7 @@ const EndpointListContent = ({ declaration, detail }: EndpointListContentProps)
render={
<button
type="button"
- className="flex size-4 shrink-0 items-center justify-center rounded-sm p-px outline-hidden hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+ className="flex size-4 shrink-0 items-center justify-center rounded-sm p-px hover:bg-state-base-hover"
>
<span
aria-hidden
diff --git a/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
index da4fd23df2f..8b2c36c5361 100644
--- a/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
@@ -132,7 +132,7 @@ const MultipleToolSelector = ({
{supportCollapse ? (
<CollapsibleTrigger
aria-label={label}
- className="group/collapse flex h-6 min-h-0 min-w-0 touch-manipulation items-center justify-start gap-0.5 rounded-lg bg-transparent system-sm-medium text-text-secondary outline-hidden select-none hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid data-panel-open:text-text-primary"
+ className="group/collapse flex h-6 min-h-0 min-w-0 touch-manipulation items-center justify-start gap-0.5 rounded-lg bg-transparent system-sm-medium text-text-secondary select-none hover:text-text-primary data-panel-open:text-text-primary"
>
<span
id={titleId}
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx
index b855f6217d7..f88361be5e4 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx
@@ -79,12 +79,13 @@ export function ToolItem({
)}
>
<PopoverTrigger
+ className="focus-visible:ring-0"
render={
<button
ref={triggerRef}
type="button"
aria-label={accessibleTriggerLabel}
- className="absolute inset-0 z-0 cursor-pointer rounded-lg border-0 bg-transparent outline-hidden focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid"
+ className="absolute inset-0 z-0 cursor-pointer rounded-lg border-0 bg-transparent focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid"
/>
}
/>
diff --git a/web/app/components/snippet-list/components/snippet-card.tsx b/web/app/components/snippet-list/components/snippet-card.tsx
index cb379ff8f38..2b0d6a3b776 100644
--- a/web/app/components/snippet-list/components/snippet-card.tsx
+++ b/web/app/components/snippet-list/components/snippet-card.tsx
@@ -199,7 +199,7 @@ const SnippetCard = ({
ns: 'common',
name: snippet.name,
})}
- className="flex size-8 items-center justify-center rounded-md border-none bg-transparent p-2 hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:inset-ring-1 focus-visible:inset-ring-components-input-border-active data-popup-open:bg-state-base-hover data-popup-open:shadow-none"
+ className="flex size-8 items-center justify-center rounded-md border-none bg-transparent p-2 hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-state-base-hover data-popup-open:shadow-none"
onClick={(e) => {
e.stopPropagation()
e.preventDefault()
diff --git a/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx b/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx
index adcc2a6691b..0a4484aff46 100644
--- a/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx
+++ b/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx
@@ -20,7 +20,7 @@ type SnippetPublishStatusFilterProps = {
}
const chipClassName =
- 'flex h-8 items-center rounded-lg border-[0.5px] px-2 text-[13px] leading-4 outline-hidden transition-colors focus-visible:ring-2 focus-visible:ring-state-accent-solid'
+ 'flex h-8 items-center rounded-lg border-[0.5px] px-2 text-[13px] leading-4 transition-colors'
const SnippetPublishStatusFilter = ({ value, onChange }: SnippetPublishStatusFilterProps) => {
const { t } = useTranslation(['app', 'snippet', 'workflow'])
diff --git a/web/app/components/step-by-step-tour/floating-widget.tsx b/web/app/components/step-by-step-tour/floating-widget.tsx
index 9d244d304ee..739e48efe6c 100644
--- a/web/app/components/step-by-step-tour/floating-widget.tsx
+++ b/web/app/components/step-by-step-tour/floating-widget.tsx
@@ -173,7 +173,7 @@ export function MinimizedTourPill({
{...props}
type="button"
className={cn(
- 'inline-flex h-8 w-45.75 max-w-[calc(100vw-16px)] items-center gap-2 overflow-hidden rounded-full border-[0.5px] border-components-panel-border bg-background-section px-3 py-2 text-saas-dify-blue-inverted outline-hidden transition-colors hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+ 'inline-flex h-8 w-45.75 max-w-[calc(100vw-16px)] items-center gap-2 overflow-hidden rounded-full border-[0.5px] border-components-panel-border bg-background-section px-3 py-2 text-saas-dify-blue-inverted transition-colors hover:bg-state-base-hover',
className,
)}
>
diff --git a/web/app/components/tools/mcp/detail/tool-item.tsx b/web/app/components/tools/mcp/detail/tool-item.tsx
index 5233430d91a..be1c88d97c0 100644
--- a/web/app/components/tools/mcp/detail/tool-item.tsx
+++ b/web/app/components/tools/mcp/detail/tool-item.tsx
@@ -58,7 +58,7 @@ const MCPToolItem = ({ tool }: Props) => {
<button
type="button"
className={cn(
- 'bg-components-panel-item-bg w-full cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 text-left shadow-xs outline-hidden hover:bg-components-panel-on-panel-item-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover',
+ 'bg-components-panel-item-bg w-full cursor-pointer rounded-xl border-[0.5px] border-components-panel-border-subtle px-4 py-3 text-left shadow-xs hover:bg-components-panel-on-panel-item-bg-hover',
)}
>
<div className="pb-0.5 system-md-semibold text-text-secondary">
diff --git a/web/app/components/workflow/block-selector/datasource-list.tsx b/web/app/components/workflow/block-selector/datasource-list.tsx
index fd5b200fded..b736af4d84f 100644
--- a/web/app/components/workflow/block-selector/datasource-list.tsx
+++ b/web/app/components/workflow/block-selector/datasource-list.tsx
@@ -101,7 +101,7 @@ function DatasourceGroup({
<div className="group/item relative flex w-full items-center rounded-lg">
<CollapsibleTrigger
aria-controls={panelId}
- className="group/collapsible flex h-8 min-h-8 w-full min-w-0 touch-manipulation items-center justify-start gap-0 rounded-lg bg-transparent pr-2 pl-3 text-start system-sm-medium text-text-secondary outline-hidden select-none group-hover/item:bg-state-base-hover hover:bg-state-base-hover hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset data-panel-open:text-text-primary"
+ className="group/collapsible flex h-8 min-h-8 w-full min-w-0 touch-manipulation items-center justify-start gap-0 rounded-lg bg-transparent pr-2 pl-3 text-start system-sm-medium text-text-secondary select-none group-hover/item:bg-state-base-hover hover:bg-state-base-hover hover:text-text-primary focus-visible:ring-inset data-panel-open:text-text-primary"
>
<div className="flex h-8 min-w-0 grow items-center">
<BlockIcon
diff --git a/web/app/components/workflow/block-selector/featured-tools.tsx b/web/app/components/workflow/block-selector/featured-tools.tsx
index e773c600404..051a80ba2b3 100644
--- a/web/app/components/workflow/block-selector/featured-tools.tsx
+++ b/web/app/components/workflow/block-selector/featured-tools.tsx
@@ -126,7 +126,7 @@ const FeaturedTools = ({
open={!isCollapsed}
onOpenChange={(open) => setIsCollapsed(!open)}
>
- <CollapsibleTrigger className="group/collapsible -ml-2 flex min-h-0 w-fit touch-manipulation items-center justify-start gap-0 rounded-md px-2 py-1 text-start system-sm-medium text-text-secondary outline-hidden select-none hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset data-panel-open:text-text-primary">
+ <CollapsibleTrigger className="group/collapsible -ml-2 flex min-h-0 w-fit touch-manipulation items-center justify-start gap-0 rounded-md px-2 py-1 text-start system-sm-medium text-text-secondary select-none hover:text-text-primary focus-visible:ring-inset data-panel-open:text-text-primary">
<span className="system-xs-medium text-text-primary">
{t(($) => $['tabs.featuredTools'], { ns: 'workflow' })}
</span>
diff --git a/web/app/components/workflow/block-selector/featured-triggers.tsx b/web/app/components/workflow/block-selector/featured-triggers.tsx
index 0f732aa3453..47b8a6251b6 100644
--- a/web/app/components/workflow/block-selector/featured-triggers.tsx
+++ b/web/app/components/workflow/block-selector/featured-triggers.tsx
@@ -130,7 +130,7 @@ const FeaturedTriggers = ({
open={!isCollapsed}
onOpenChange={(open) => setIsCollapsed(!open)}
>
- <CollapsibleTrigger className="group/collapsible ml-2 flex min-h-0 w-fit touch-manipulation items-center justify-start gap-0 rounded-md px-2 py-1 text-start system-sm-medium text-text-secondary outline-hidden select-none hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset data-panel-open:text-text-primary">
+ <CollapsibleTrigger className="group/collapsible ml-2 flex min-h-0 w-fit touch-manipulation items-center justify-start gap-0 rounded-md px-2 py-1 text-start system-sm-medium text-text-secondary select-none hover:text-text-primary focus-visible:ring-inset data-panel-open:text-text-primary">
<span className="system-xs-medium text-text-primary">
{t(($) => $['tabs.featuredTools'], { ns: 'workflow' })}
</span>
diff --git a/web/app/components/workflow/block-selector/index.tsx b/web/app/components/workflow/block-selector/index.tsx
index 95204386c1b..204e8ee0a7b 100644
--- a/web/app/components/workflow/block-selector/index.tsx
+++ b/web/app/components/workflow/block-selector/index.tsx
@@ -135,6 +135,7 @@ function BlockSelector({
ref={triggerRef}
aria-label={triggerAriaLabel}
disabled={disabled}
+ className={triggerClassName}
render={trigger}
onClick={handleTrigger}
/>
diff --git a/web/app/components/workflow/block-selector/tool/tool.tsx b/web/app/components/workflow/block-selector/tool/tool.tsx
index a68f049d204..ef2fdc0d93d 100644
--- a/web/app/components/workflow/block-selector/tool/tool.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool.tsx
@@ -227,7 +227,7 @@ function Tool({
<div className="group/item relative flex w-full items-center rounded-lg">
<CollapsibleTrigger
aria-controls={panelId}
- className="group/collapsible flex h-8 min-h-8 w-full min-w-0 touch-manipulation items-center justify-start gap-0 rounded-lg bg-transparent pr-2 pl-3 text-start system-sm-medium text-text-secondary outline-hidden select-none group-hover/item:bg-state-base-hover hover:bg-state-base-hover hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset data-panel-open:text-text-primary"
+ className="group/collapsible flex h-8 min-h-8 w-full min-w-0 touch-manipulation items-center justify-start gap-0 rounded-lg bg-transparent pr-2 pl-3 text-start system-sm-medium text-text-secondary select-none group-hover/item:bg-state-base-hover hover:bg-state-base-hover hover:text-text-primary focus-visible:ring-inset data-panel-open:text-text-primary"
>
{providerDetails}
{!isShowCanNotChooseMCPTip && !canNotSelectMultiple && selectedStatus && (
diff --git a/web/app/components/workflow/comment/thread.tsx b/web/app/components/workflow/comment/thread.tsx
index 54bccab3367..1e34128891b 100644
--- a/web/app/components/workflow/comment/thread.tsx
+++ b/web/app/components/workflow/comment/thread.tsx
@@ -576,7 +576,7 @@ function CommentThreadComponent({
onOpenChange={(open) => setActiveReplyMenuId(open ? comment.id : null)}
>
<DropdownMenuTrigger
- className="absolute top-1 right-1 flex size-6 items-center justify-center rounded-md text-text-tertiary opacity-0 outline-hidden group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus:opacity-100 focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:opacity-100 [@media(hover:none)]:opacity-100"
+ className="absolute top-1 right-1 flex size-6 items-center justify-center rounded-md text-text-tertiary opacity-0 group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus:opacity-100 data-popup-open:opacity-100 [@media(hover:none)]:opacity-100"
aria-label={t(($) => $['comments.aria.commentActions'], {
ns: 'workflowComments',
})}
@@ -668,7 +668,7 @@ function CommentThreadComponent({
if (element) replyMenuTriggersRef.current.set(reply.id, element)
else replyMenuTriggersRef.current.delete(reply.id)
}}
- className="absolute top-1 right-1 flex size-6 items-center justify-center rounded-md text-text-tertiary opacity-0 outline-hidden group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus:opacity-100 focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:opacity-100 [@media(hover:none)]:opacity-100"
+ className="absolute top-1 right-1 flex size-6 items-center justify-center rounded-md text-text-tertiary opacity-0 group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus:opacity-100 data-popup-open:opacity-100 [@media(hover:none)]:opacity-100"
data-reply-menu
aria-label={t(($) => $['comments.aria.replyActions'], {
ns: 'workflowComments',
diff --git a/web/app/components/workflow/node-actions-menu/context-menu-content.tsx b/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
index 7a9e622076e..0fc3990fe36 100644
--- a/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
+++ b/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
@@ -65,7 +65,14 @@ export function NodeActionsContextMenuContent(props: NodeActionsMenuProps) {
<Popover modal="trap-focus">
<ContextMenuItem
closeOnClick={false}
- render={<PopoverTrigger nativeButton={false} render={<div />} />}
+ // The menu row owns the focus treatment, so the trigger adds no ring.
+ render={
+ <PopoverTrigger
+ nativeButton={false}
+ className="focus-visible:ring-0"
+ render={<div />}
+ />
+ }
className="data-popup-open:bg-state-base-hover"
>
{t(($) => $['panel.changeBlock'], { ns: 'workflow' })}
diff --git a/web/app/components/workflow/node-actions-menu/index.tsx b/web/app/components/workflow/node-actions-menu/index.tsx
index 7ab114f8b2e..5b094da22b9 100644
--- a/web/app/components/workflow/node-actions-menu/index.tsx
+++ b/web/app/components/workflow/node-actions-menu/index.tsx
@@ -128,7 +128,14 @@ function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
<Popover modal="trap-focus">
<DropdownMenuItem
closeOnClick={false}
- render={<PopoverTrigger nativeButton={false} render={<div />} />}
+ // The menu row owns the focus treatment, so the trigger adds no ring.
+ render={
+ <PopoverTrigger
+ nativeButton={false}
+ className="focus-visible:ring-0"
+ render={<div />}
+ />
+ }
className="data-popup-open:bg-state-base-hover"
>
{t(($) => $['panel.changeBlock'], { ns: 'workflow' })}
diff --git a/web/app/components/workflow/nodes/_base/components/agent-strategy-list.tsx b/web/app/components/workflow/nodes/_base/components/agent-strategy-list.tsx
index 315a598d887..48744a849d1 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy-list.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy-list.tsx
@@ -95,7 +95,7 @@ function StrategyProvider({
<div className="group/item relative flex w-full items-center rounded-lg">
<CollapsibleTrigger
aria-controls={panelId}
- className="group/collapsible flex h-8 min-h-8 w-full min-w-0 touch-manipulation items-center justify-start gap-0 rounded-lg bg-transparent pr-2 pl-3 text-start system-sm-medium text-text-secondary outline-hidden select-none group-hover/item:bg-state-base-hover hover:bg-state-base-hover hover:text-text-primary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset data-panel-open:text-text-primary"
+ className="group/collapsible flex h-8 min-h-8 w-full min-w-0 touch-manipulation items-center justify-start gap-0 rounded-lg bg-transparent pr-2 pl-3 text-start system-sm-medium text-text-secondary select-none group-hover/item:bg-state-base-hover hover:bg-state-base-hover hover:text-text-primary focus-visible:ring-inset data-panel-open:text-text-primary"
>
<BlockIcon
className="shrink-0"
diff --git a/web/app/components/workflow/nodes/_base/components/collapse/index.tsx b/web/app/components/workflow/nodes/_base/components/collapse/index.tsx
index cdc5317ca26..5108653fac8 100644
--- a/web/app/components/workflow/nodes/_base/components/collapse/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/collapse/index.tsx
@@ -46,7 +46,7 @@ export function CollapseTrigger({ className, ...props }: CollapseTriggerProps) {
return (
<CollapsibleTrigger
className={cn(
- 'group/collapse ml-4 flex h-6 min-h-0 min-w-0 shrink-0 touch-manipulation items-center justify-start gap-0 rounded-md text-start system-sm-medium text-text-secondary outline-hidden select-none hover:not-data-disabled:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid data-disabled:cursor-not-allowed data-disabled:text-text-disabled data-panel-open:text-text-secondary',
+ 'group/collapse ml-4 flex h-6 min-h-0 min-w-0 shrink-0 touch-manipulation items-center justify-start gap-0 rounded-md text-start system-sm-medium text-text-secondary select-none hover:not-data-disabled:text-text-secondary data-disabled:cursor-not-allowed data-disabled:text-text-disabled data-panel-open:text-text-secondary',
className,
)}
{...props}
diff --git a/web/app/components/workflow/nodes/_base/components/prompt/editor.tsx b/web/app/components/workflow/nodes/_base/components/prompt/editor.tsx
index b905e13db12..082ab9ead48 100644
--- a/web/app/components/workflow/nodes/_base/components/prompt/editor.tsx
+++ b/web/app/components/workflow/nodes/_base/components/prompt/editor.tsx
@@ -181,7 +181,7 @@ const Editor: FC<Props> = ({
render={
<button
type="button"
- className="flex size-4 shrink-0 items-center justify-center rounded-sm p-px outline-hidden hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+ className="flex size-4 shrink-0 items-center justify-center rounded-sm p-px hover:bg-state-base-hover"
>
<span
aria-hidden
@@ -229,7 +229,7 @@ const Editor: FC<Props> = ({
render={
<button
type="button"
- className="flex h-4 w-7 items-center justify-center rounded-sm outline-hidden hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+ className="flex h-4 w-7 items-center justify-center rounded-sm hover:bg-state-base-hover"
>
<span
aria-hidden
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
index 51ab67e5486..0c27bc32a29 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
@@ -812,7 +812,7 @@ function WorkflowInlineAgentConfigureMoreAction({
render={
<button
type="button"
- 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"
+ className="flex size-6 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary"
aria-label={t(($) => $['operation.more'])}
>
<span aria-hidden className="i-ri-more-fill size-4" />
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-output-variables/edit-card.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-output-variables/edit-card.tsx
index 5f51fe322a3..cc8003b7c2c 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-output-variables/edit-card.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-output-variables/edit-card.tsx
@@ -179,7 +179,7 @@ export function OutputEditCard({
</div>
{allowDefaultValue && (
<Collapsible>
- <CollapsibleTrigger className="group/collapsible flex h-8 min-h-8 w-full touch-manipulation items-center justify-start gap-2 gap-x-0.5 border-y border-divider-subtle pr-2 pl-2.5 text-start system-xs-regular text-text-tertiary outline-hidden select-none hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:ring-inset">
+ <CollapsibleTrigger className="group/collapsible flex h-8 min-h-8 w-full touch-manipulation items-center justify-start gap-2 gap-x-0.5 border-y border-divider-subtle pr-2 pl-2.5 text-start system-xs-regular text-text-tertiary select-none hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-inset">
<span
aria-hidden="true"
className="i-ri-arrow-down-double-line size-3 transition-transform duration-100 ease-out group-data-panel-open/collapsible:rotate-180 motion-reduce:transition-none"
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
index 14c887a2788..59a9000edfd 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
@@ -222,7 +222,7 @@ function AgentRosterDrawer({
aria-label={t(($) => $[`${i18nPrefix}.roster.more`], {
ns: 'workflowAgent',
})}
- className="flex size-6 cursor-pointer items-center justify-center rounded-md text-text-tertiary 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"
+ className="flex size-6 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover data-popup-open:bg-state-base-hover"
>
<span aria-hidden className="i-ri-more-fill size-4" />
</DropdownMenuTrigger>
@@ -444,7 +444,7 @@ export function AgentRosterField({
type="button"
disabled={isPending}
className={cn(
- 'flex h-6 shrink-0 cursor-pointer items-center justify-center rounded-md px-1.5 py-1 system-xs-medium 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',
+ 'flex h-6 shrink-0 cursor-pointer items-center justify-center rounded-md px-1.5 py-1 system-xs-medium text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',
isPending &&
'cursor-not-allowed opacity-50 hover:bg-transparent hover:text-text-tertiary',
)}
diff --git a/web/app/components/workflow/operator/add-block.tsx b/web/app/components/workflow/operator/add-block.tsx
index 1e2e13be197..d6c0efba7ec 100644
--- a/web/app/components/workflow/operator/add-block.tsx
+++ b/web/app/components/workflow/operator/add-block.tsx
@@ -21,6 +21,7 @@ import {
type AddBlockProps = {
renderTrigger?: BlockSelectorProps['trigger']
+ triggerClassName?: BlockSelectorProps['triggerClassName']
sideOffset?: BlockSelectorProps['sideOffset']
alignOffset?: BlockSelectorProps['alignOffset']
onClose?: () => void
@@ -28,6 +29,7 @@ type AddBlockProps = {
}
const AddBlock = ({
renderTrigger,
+ triggerClassName,
sideOffset,
alignOffset,
onClose,
@@ -105,8 +107,12 @@ const AddBlock = ({
sideOffset={sideOffset ?? 4}
alignOffset={alignOffset ?? -8}
trigger={renderTrigger || renderTriggerElement}
+ triggerClassName={triggerClassName}
triggerAriaLabel={t(($) => $['common.addBlock'], { ns: 'workflow' })}
- triggerTooltip={t(($) => $['common.addBlock'], { ns: 'workflow' })}
+ // A caller-provided trigger, such as a menu row, already shows its own label.
+ triggerTooltip={
+ renderTrigger ? undefined : t(($) => $['common.addBlock'], { ns: 'workflow' })
+ }
popupClassName="min-w-[256px]!"
availableBlocksTypes={availableNextBlocks}
showStartTab={showStartTab}
diff --git a/web/app/components/workflow/panel-contextmenu.tsx b/web/app/components/workflow/panel-contextmenu.tsx
index 733bd935e86..d56d48044b6 100644
--- a/web/app/components/workflow/panel-contextmenu.tsx
+++ b/web/app/components/workflow/panel-contextmenu.tsx
@@ -94,6 +94,8 @@ export function PanelContextmenu({ onClose }: { onClose: () => void }) {
{canEditWorkflow && (
<AddBlock
renderTrigger={addBlockTrigger}
+ // The menu row owns the focus treatment, so the trigger adds no ring.
+ triggerClassName="focus-visible:ring-0"
onClose={onClose}
isolateKeyboardEvents
sideOffset={-36}
diff --git a/web/app/signin/one-more-step.tsx b/web/app/signin/one-more-step.tsx
index 58e664c56d7..f529e8483fd 100644
--- a/web/app/signin/one-more-step.tsx
+++ b/web/app/signin/one-more-step.tsx
@@ -141,7 +141,7 @@ const OneMoreStep = () => {
render={
<button
type="button"
- className="cursor-pointer rounded-sm text-text-accent-secondary outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="cursor-pointer rounded-sm text-text-accent-secondary"
>
{t(($) => $.dontHave, { ns: 'login' })}
</button>
diff --git a/web/features/agent-v2/agent-detail/configure/components/community-edition-tip.tsx b/web/features/agent-v2/agent-detail/configure/components/community-edition-tip.tsx
index 645b8198f6c..14f39f44bf5 100644
--- a/web/features/agent-v2/agent-detail/configure/components/community-edition-tip.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/community-edition-tip.tsx
@@ -37,7 +37,7 @@ export function CommunityEditionTip({
render={
<button
type="button"
- className="inline-flex size-4 shrink-0 items-center justify-center rounded-sm focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
+ className="inline-flex size-4 shrink-0 items-center justify-center rounded-sm"
>
<span
aria-hidden
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/common/section.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/common/section.tsx
index 1dad938ee72..9284a4e05df 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/common/section.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/common/section.tsx
@@ -56,7 +56,7 @@ export function ConfigureSection({
<div className="group/collapse-title flex min-w-0 items-center">
<Heading className="relative min-w-0 shrink-0">
{isBuildDraftChanged && <AgentBuildDraftChangeDot />}
- <CollapsibleTrigger className="flex h-6 min-h-0 max-w-full touch-manipulation items-center justify-start gap-0 rounded-sm system-sm-medium text-text-secondary outline-hidden select-none focus-visible:ring-2 focus-visible:ring-state-accent-solid">
+ <CollapsibleTrigger className="flex h-6 min-h-0 max-w-full touch-manipulation items-center justify-start gap-0 rounded-sm system-sm-medium text-text-secondary select-none">
<span id={labelId} className="min-w-0 truncate system-sm-semibold-uppercase">
{label}
</span>
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx
index 617201e3320..4f551cc7b0a 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx
@@ -411,7 +411,7 @@ function WorkspaceAgentSkillItem({
name: displayName,
})}
className={cn(
- 'pointer-events-none absolute top-1/2 right-1 z-10 flex size-6 -translate-y-1/2 items-center justify-center rounded-md text-text-tertiary opacity-0 group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-popup-open:pointer-events-auto data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary data-popup-open:opacity-100',
+ 'pointer-events-none absolute top-1/2 right-1 z-10 flex size-6 -translate-y-1/2 items-center justify-center rounded-md text-text-tertiary opacity-0 group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary data-popup-open:pointer-events-auto data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary data-popup-open:opacity-100',
isRemoveHighlighted && 'text-text-destructive!',
)}
onClick={(event) => event.stopPropagation()}
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx
index 35b2ea3985a..8daafb8bfa8 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx
@@ -172,7 +172,7 @@ export function AgentSkillItem({
name: skill.name,
})}
className={cn(
- 'pointer-events-none absolute top-1/2 right-1 z-10 flex size-6 -translate-y-1/2 items-center justify-center rounded-md text-text-tertiary opacity-0 group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-popup-open:pointer-events-auto data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary data-popup-open:opacity-100',
+ 'pointer-events-none absolute top-1/2 right-1 z-10 flex size-6 -translate-y-1/2 items-center justify-center rounded-md text-text-tertiary opacity-0 group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary data-popup-open:pointer-events-auto data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary data-popup-open:opacity-100',
isRemoveHighlighted && 'text-text-destructive!',
)}
onClick={(event) => event.stopPropagation()}
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/tools/provider-tool/item.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/tools/provider-tool/item.tsx
index 3867b2e3789..81cc8fd3d91 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/tools/provider-tool/item.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/tools/provider-tool/item.tsx
@@ -312,7 +312,7 @@ export const AgentProviderToolItem = memo(
className="overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg p-1 shadow-xs shadow-shadow-shadow-3"
>
<div className="flex min-h-7 items-center gap-1 rounded-lg py-0.5 pr-0.5 pl-1">
- <CollapsibleTrigger className="group/collapsible flex min-h-0 w-full min-w-0 flex-1 touch-manipulation items-center justify-start gap-2 rounded-md pr-1 text-left system-sm-medium text-text-secondary outline-hidden select-none focus-visible:ring-2 focus-visible:ring-state-accent-solid">
+ <CollapsibleTrigger className="group/collapsible flex min-h-0 w-full min-w-0 flex-1 touch-manipulation items-center justify-start gap-2 rounded-md pr-1 text-left system-sm-medium text-text-secondary select-none">
<ProviderIcon icon={icon} iconClassName={tool.iconClassName} />
<span className="flex min-w-0 items-center">
<span className="min-w-0 truncate system-sm-medium text-text-primary">
@@ -328,7 +328,7 @@ export const AgentProviderToolItem = memo(
</CollapsibleTrigger>
{!readOnly && (
<DropdownMenu modal={false}>
- <DropdownMenuTrigger className="flex size-6 shrink-0 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 data-popup-open:bg-state-base-hover">
+ <DropdownMenuTrigger className="flex size-6 shrink-0 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:bg-state-base-hover">
<span className="sr-only">
{t(($) => $['agentDetail.configure.tools.moreActions'], { name: tool.name })}
</span>
diff --git a/web/features/agent-v2/agent-detail/configure/components/preview/header.tsx b/web/features/agent-v2/agent-detail/configure/components/preview/header.tsx
index 7608947ffcb..994a8e72422 100644
--- a/web/features/agent-v2/agent-detail/configure/components/preview/header.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/preview/header.tsx
@@ -46,7 +46,7 @@ function ModeInfoTip({ children, ariaLabel }: { children: ReactNode; ariaLabel:
closeDelay={200}
aria-label={ariaLabel}
onClick={handleClick}
- className="inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent p-0 focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"
+ className="inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent p-0"
>
<span
aria-hidden
diff --git a/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/filter.tsx b/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/filter.tsx
index ee148b04841..8e8891db771 100644
--- a/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/filter.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/filter.tsx
@@ -50,7 +50,7 @@ export function VersionFilter({
type="button"
aria-label={t(($) => $['agentDetail.versionHistory.filter'])}
className={cn(
- 'flex size-6 shrink-0 items-center justify-center rounded-md p-0.5 focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden',
+ 'flex size-6 shrink-0 items-center justify-center rounded-md p-0.5',
isFiltering
? 'bg-state-accent-active-alt text-text-accent'
: 'text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',
diff --git a/web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx b/web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx
index 40d6e7bbbed..39dbc70eafc 100644
--- a/web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx
+++ b/web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx
@@ -40,7 +40,7 @@ export function AgentWorkflowReferencesDropdown({
return (
<DropdownMenu modal={false}>
- <DropdownMenuTrigger className="pointer-events-auto relative -m-1 flex h-6 shrink-0 cursor-pointer items-center gap-1 rounded-md p-1 outline-hidden before:pointer-events-none before:absolute before:inset-0 before:rounded-md before:content-[''] hover:before:bg-state-base-hover focus-visible:before:ring-2 focus-visible:before:ring-state-accent-solid data-popup-open:before:bg-state-base-hover">
+ <DropdownMenuTrigger className="pointer-events-auto relative -m-1 flex h-6 shrink-0 cursor-pointer items-center gap-1 rounded-md p-1 before:pointer-events-none before:absolute before:inset-0 before:rounded-md before:content-[''] hover:before:bg-state-base-hover data-popup-open:before:bg-state-base-hover">
<span
aria-hidden
className="i-custom-vender-agent-v2-plan size-3 shrink-0 text-text-tertiary"
diff --git a/web/features/new-rag/components/knowledge-view-switcher.tsx b/web/features/new-rag/components/knowledge-view-switcher.tsx
index aa01ca541e9..427ce4d05c0 100644
--- a/web/features/new-rag/components/knowledge-view-switcher.tsx
+++ b/web/features/new-rag/components/knowledge-view-switcher.tsx
@@ -60,7 +60,7 @@ export function KnowledgeViewSwitcher({ value, onChange }: KnowledgeViewSwitcher
render={
<button
type="button"
- className="absolute top-1.25 right-1 z-10 flex size-3.5 items-center justify-center rounded-sm text-text-tertiary outline-hidden hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="absolute top-1.25 right-1 z-10 flex size-3.5 items-center justify-center rounded-sm text-text-tertiary hover:text-text-secondary"
>
<span aria-hidden className="i-ri-question-line size-3.5" />
</button>
diff --git a/web/features/new-rag/document-list.tsx b/web/features/new-rag/document-list.tsx
index f0bef7f13ed..ab262653e8e 100644
--- a/web/features/new-rag/document-list.tsx
+++ b/web/features/new-rag/document-list.tsx
@@ -194,7 +194,7 @@ const DocumentRow = memo(
<DropdownMenu modal={false}>
<DropdownMenuTrigger
aria-label={t(($) => $['newKnowledge.documentActions'], { name: document.title })}
- className="flex size-7 items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="flex size-7 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover"
>
<span aria-hidden className="i-ri-more-fill size-4" />
</DropdownMenuTrigger>
diff --git a/web/features/new-rag/sources-page.tsx b/web/features/new-rag/sources-page.tsx
index 06a417170a1..7463dcf3043 100644
--- a/web/features/new-rag/sources-page.tsx
+++ b/web/features/new-rag/sources-page.tsx
@@ -113,7 +113,7 @@ function SourceActions({
<DropdownMenuTrigger
aria-label={t(($) => $['newKnowledge.sourceActions'], { name: source.name })}
disabled={Boolean(pendingAction)}
- className="flex size-7 items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid disabled:cursor-not-allowed disabled:text-text-disabled"
+ className="flex size-7 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover disabled:cursor-not-allowed disabled:text-text-disabled"
>
<span
aria-hidden
diff --git a/web/features/skills/detail/file-tree-items.tsx b/web/features/skills/detail/file-tree-items.tsx
index 0a4b19317df..65eb023601a 100644
--- a/web/features/skills/detail/file-tree-items.tsx
+++ b/web/features/skills/detail/file-tree-items.tsx
@@ -281,7 +281,7 @@ function FileActions({
<DropdownMenuTrigger
aria-label={tCommon(($) => $['operation.more'])}
className={cn(
- 'relative z-10 size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:flex data-popup-open:bg-state-base-hover',
+ 'relative z-10 size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:flex data-popup-open:bg-state-base-hover',
visible ? 'flex' : 'hidden group-hover:flex',
)}
onClick={(event) => event.stopPropagation()}
diff --git a/web/features/skills/detail/file-tree.tsx b/web/features/skills/detail/file-tree.tsx
index 04519bc620d..560e33a1efe 100644
--- a/web/features/skills/detail/file-tree.tsx
+++ b/web/features/skills/detail/file-tree.tsx
@@ -1355,7 +1355,7 @@ export function FileTree({
<DropdownMenu modal={false}>
<DropdownMenuTrigger
aria-label={tCommon(($) => $['operation.add'])}
- className="flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-lg text-text-secondary outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover"
+ className="flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-lg text-text-secondary hover:bg-state-base-hover data-popup-open:bg-state-base-hover"
disabled={!detail || isMutating}
>
<span aria-hidden className="i-ri-add-line size-4" />
@@ -1595,7 +1595,7 @@ export function FileTree({
render={
<button
type="button"
- className="-mx-2 flex h-6 w-[calc(100%+16px)] cursor-pointer items-center gap-2 rounded-md px-2.5 text-left system-xs-regular text-text-tertiary outline-hidden hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
+ className="-mx-2 flex h-6 w-[calc(100%+16px)] cursor-pointer items-center gap-2 rounded-md px-2.5 text-left system-xs-regular text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
>
<span aria-hidden className="i-ri-apps-2-line size-4 shrink-0" />
<span className="min-w-0 flex-1 truncate">{referenceCountLabel}</span>
diff --git a/web/features/skills/detail/sidebar-actions.tsx b/web/features/skills/detail/sidebar-actions.tsx
index 94f2220f89c..0df3d5f51ea 100644
--- a/web/features/skills/detail/sidebar-actions.tsx
+++ b/web/features/skills/detail/sidebar-actions.tsx
@@ -249,7 +249,7 @@ export function SkillDetailSidebarActions({
aria-label={t(($) => $['skillManagement.moreActions'], {
name: detail.display_name,
})}
- className="mt-px flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
+ className="mt-px flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
>
<span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
</DropdownMenuTrigger>
diff --git a/web/features/skills/detail/version-panel.tsx b/web/features/skills/detail/version-panel.tsx
index 95c9321d2d3..b8134291c6b 100644
--- a/web/features/skills/detail/version-panel.tsx
+++ b/web/features/skills/detail/version-panel.tsx
@@ -166,7 +166,7 @@ function VersionFilter({
})
}`}
className={cn(
- 'flex size-6 shrink-0 items-center justify-center rounded-md p-0.5 outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+ 'flex size-6 shrink-0 items-center justify-center rounded-md p-0.5',
isFiltering
? 'bg-state-accent-active-alt text-text-accent'
: 'text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',
@@ -377,7 +377,7 @@ function VersionRow({
<DropdownMenu modal={false}>
<DropdownMenuTrigger
aria-label={tCommon(($) => $['operation.more'])}
- className="absolute top-1 right-1 flex size-6 shrink-0 cursor-pointer items-center justify-center overflow-hidden rounded-md border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-1 opacity-0 shadow-xs outline-hidden group-hover:opacity-100 focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:opacity-100"
+ className="absolute top-1 right-1 flex size-6 shrink-0 cursor-pointer items-center justify-center overflow-hidden rounded-md border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-1 opacity-0 shadow-xs group-hover:opacity-100 focus-visible:opacity-100 data-popup-open:opacity-100"
>
<span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
</DropdownMenuTrigger>