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): remove doubled focus rings on overlay triggers (#43701)

yyh593f05170b0e
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/index.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/index.tsx
index 93a3c1fa24d..e6dbee0a802 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/index.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/index.tsx
@@ -17,9 +17,9 @@ const FileUploaderInChatInput = ({ fileConfig, readonly }: FileUploaderInChatInp
type="button"
aria-label={t(($) => $['fileUploader.uploadFromComputer'], { ns: 'common' })}
className={cn(
- 'inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-lg p-1.5 text-text-tertiary outline-hidden',
+ 'inline-flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-lg p-1.5 text-text-tertiary',
'hover:bg-state-base-hover hover:text-text-secondary',
- 'focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',
+ 'focus-visible:ring-inset',
'data-popup-open:bg-state-base-hover',
'disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:bg-transparent disabled:hover:text-text-disabled',
)}
diff --git a/web/app/components/header/account-dropdown/index.tsx b/web/app/components/header/account-dropdown/index.tsx
index a9ecc994bfa..2a8655c7841 100644
--- a/web/app/components/header/account-dropdown/index.tsx
+++ b/web/app/components/header/account-dropdown/index.tsx
@@ -195,7 +195,7 @@ function MainNavMenuContent({ onLogout }: MainNavMenuContentProps) {
</DropdownMenuItem>
<AppearanceSubmenu />
</DropdownMenuGroup>
- <DropdownMenuSeparator className="my-0!" />
+ <DropdownMenuSeparator className="my-0" />
<DropdownMenuGroup className="p-1">
<DropdownMenuItem
className="mx-0 px-3 py-1"
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 af63404d90a..4ba06f6b19d 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
@@ -2,6 +2,7 @@
import type { SelectorKey } from 'i18next'
import { cn } from '@langgenius/dify-ui/cn'
+import { IconButton } from '@langgenius/dify-ui/icon-button'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { memo } from 'react'
import { Trans, useTranslation } from 'react-i18next'
@@ -38,7 +39,6 @@ const PermissionRoleChip = ({
const chipRootClassName = cn(
'inline-flex h-6 max-w-full min-w-0 items-center gap-1 rounded-full border-[0.5px] border-components-panel-border-subtle bg-background-body px-1.5 py-0.5 system-xs-medium text-text-primary shadow-xs transition-colors',
'hover:bg-background-section-burn has-data-popup-open:bg-background-section-burn',
- 'has-focus-visible:ring-2 has-focus-visible:ring-state-accent-solid',
className,
)
@@ -60,14 +60,14 @@ const PermissionRoleChip = ({
}
/>
{canRemoveRole && (
- <button
- type="button"
+ <IconButton
+ size="xs"
aria-label={removeLabel}
- className="flex size-3.5 shrink-0 items-center justify-center rounded-full border-none bg-transparent p-0 text-text-tertiary outline-hidden hover:bg-state-base-hover-alt hover:text-text-secondary focus-visible:bg-state-base-hover-alt focus-visible:text-text-secondary"
+ className="shrink-0 rounded-full"
onClick={() => onRemove?.(roleId)}
>
<span aria-hidden className="i-ri-close-line size-3" />
- </button>
+ </IconButton>
)}
</span>
)
diff --git a/web/app/components/main-nav/components/account-section.tsx b/web/app/components/main-nav/components/account-section.tsx
index 50bccce8983..8f217a5b914 100644
--- a/web/app/components/main-nav/components/account-section.tsx
+++ b/web/app/components/main-nav/components/account-section.tsx
@@ -23,7 +23,7 @@ const AccountSection = ({ compact = false }: AccountSectionProps) => {
type="button"
title={userProfile.name}
className={cn(
- 'flex min-w-0 shrink items-center rounded-full text-left text-components-main-nav-text transition-colors hover:bg-state-base-hover focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid focus-visible:outline-hidden disabled:cursor-default disabled:hover:bg-transparent',
+ 'flex min-w-0 shrink items-center rounded-full text-left text-components-main-nav-text transition-colors hover:bg-state-base-hover focus-visible:ring-inset disabled:cursor-default disabled:hover:bg-transparent',
compact ? 'justify-center p-1' : 'max-w-45 gap-3 py-1 pr-4 pl-1',
'data-popup-open:bg-state-base-hover',
)}