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.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
refactor(dify-ui): make ComboboxTrigger own only the focus indicator (#43655)
yyh3d27e201bcf6
diff --git a/packages/dify-ui/src/combobox/index.stories.tsx b/packages/dify-ui/src/combobox/index.stories.tsxindex 60712dde5a7..2fb667f135b 100644--- a/packages/dify-ui/src/combobox/index.stories.tsx+++ b/packages/dify-ui/src/combobox/index.stories.tsx@@ -13,6 +13,7 @@ import {ComboboxEmpty,ComboboxGroup,ComboboxGroupLabel,+ ComboboxIcon,ComboboxInput,ComboboxInputGroup,ComboboxInputTrigger,@@ -479,7 +480,7 @@ function VirtualizedLongListDemo() {}}><ComboboxLabel>Model catalog</ComboboxLabel>- <ComboboxTrigger>+ <ComboboxTrigger render={<Button variant="secondary" />}><ComboboxValue placeholder="Select model" /></ComboboxTrigger><ComboboxPortal>@@ -662,7 +663,7 @@ const meta = {docs: {description: {component:- 'Compound combobox built on Base UI Combobox for searchable predefined selections. Use an input as the trigger, place an input inside a named popup, or set `inline` when an external Popover owns the surface. Keep independent actions outside the listbox, keep Status mounted while changing its children, and use Clear only for selection clearing.',+ 'Compound combobox built on Base UI Combobox for searchable predefined selections. Use an input as the trigger, or open a named popup that contains the input from the unstyled trigger, composed through `render` or with Value and Icon for a select-like field, or set `inline` when an external Popover owns the surface. Keep independent actions outside the listbox, keep Status mounted while changing its children, and use Clear only for selection clearing.',},},},@@ -721,8 +722,11 @@ export const TriggerWithPopupInput: Story = {<div className={fieldWidth}><Combobox items={dataSourceOptions} defaultValue={defaultPopupDataSource}><ComboboxLabel>Data source</ComboboxLabel>- <ComboboxTrigger>- <ComboboxValue placeholder="Choose source" />+ <ComboboxTrigger className="group/trigger flex h-8 w-full min-w-0 items-center gap-0.5 rounded-lg bg-components-input-bg-normal px-3 py-2 text-start system-sm-regular text-components-input-text-filled transition-colors hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-placeholder:text-components-input-text-placeholder data-popup-open:bg-state-base-hover-alt motion-reduce:transition-none">+ <span className="min-w-0 grow truncate">+ <ComboboxValue placeholder="Choose source" />+ </span>+ <ComboboxIcon className="text-text-quaternary transition-colors group-hover/trigger:text-text-secondary group-data-popup-open/trigger:text-text-secondary" /></ComboboxTrigger><ComboboxPortal><ComboboxPositioner>@@ -815,7 +819,7 @@ export const Grouped: Story = {<div className={fieldWidth}><Combobox items={toolGroups} defaultValue={defaultTool}><ComboboxLabel>Workflow tool</ComboboxLabel>- <ComboboxTrigger>+ <ComboboxTrigger render={<Button variant="secondary" />}><ComboboxValue placeholder="Select tool" /></ComboboxTrigger><ComboboxPortal>@@ -950,7 +954,7 @@ export const Disabled: Story = {<div className={fieldWidth}><Combobox items={providerOptions} defaultValue={disabledProvider} disabled><ComboboxLabel>Disabled provider</ComboboxLabel>- <ComboboxTrigger>+ <ComboboxTrigger render={<Button variant="secondary" />}><ComboboxValue /></ComboboxTrigger><ComboboxPortal>@@ -1014,7 +1018,7 @@ function ControlledDemo() {<div className="w-full"><Combobox<string, false, Option> items={tagItems} value={value} onValueChange={setValue}><ComboboxLabel>Default app tag</ComboboxLabel>- <ComboboxTrigger>+ <ComboboxTrigger render={<Button variant="secondary" />}><ComboboxValue placeholder="Select tag" /></ComboboxTrigger><ComboboxPortal>diff --git a/packages/dify-ui/src/combobox/index.tsx b/packages/dify-ui/src/combobox/index.tsxindex 4463ba5c08c..20d43a018b5 100644--- a/packages/dify-ui/src/combobox/index.tsx+++ b/packages/dify-ui/src/combobox/index.tsx@@ -91,59 +91,21 @@ const comboboxItemClassName = ['data-disabled:cursor-not-allowed data-disabled:opacity-30 data-disabled:hover:bg-transparent data-disabled:hover:text-text-secondary',]-const comboboxTriggerVariants = cva(- [- 'group/combobox-trigger flex w-full min-w-0 items-center border-0 bg-components-input-bg-normal text-start text-components-input-text-filled outline-hidden transition-colors',- 'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt',- 'focus-visible:ring-2 focus-visible:ring-state-accent-solid',- 'data-placeholder:text-components-input-text-placeholder',- 'data-readonly:cursor-default data-readonly:bg-transparent data-readonly:hover:bg-transparent',- 'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled',- 'data-disabled:data-placeholder:text-components-input-text-disabled',- 'motion-reduce:transition-none',- ],- {- variants: {- size: {- small: 'h-6 gap-px rounded-md px-2 py-1 system-xs-regular',- medium: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',- large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',- },- },- defaultVariants: {- size: 'medium',- },- },-)--type ComboboxTriggerProps = BaseCombobox.Trigger.Props &- VariantProps<typeof comboboxTriggerVariants> & {- icon?: React.ReactNode | false- }+type ComboboxTriggerProps = BaseCombobox.Trigger.Props-function ComboboxTrigger({- className,- children,- icon,- size,- type = 'button',- ...props-}: ComboboxTriggerProps) {+// Owns the focus indicator only. The caller owns the appearance, directly or through `render`.+function ComboboxTrigger({ className, type = 'button', ...props }: ComboboxTriggerProps) {return (<BaseCombobox.Triggertype={type}className={(state) =>- cn(comboboxTriggerVariants({ size, className: resolveClassName(className, state) }))+ cn(+ 'outline-hidden focus-visible:ring-2 focus-visible:ring-state-accent-solid',+ resolveClassName(className, state),+ )}{...props}- >- <span className="min-w-0 grow truncate">{children}</span>- {icon !== false && (- <BaseCombobox.Icon className="shrink-0 text-text-quaternary transition-colors group-hover/combobox-trigger:text-text-secondary group-data-popup-open/combobox-trigger:text-text-secondary group-data-readonly/combobox-trigger:hidden">- {icon ?? <span className="i-ri-arrow-down-s-line h-4 w-4" aria-hidden="true" />}- </BaseCombobox.Icon>- )}- </BaseCombobox.Trigger>+ />)}diff --git a/web/app/components/apps/creators-filter.tsx b/web/app/components/apps/creators-filter.tsxindex 89bd932055f..5cf75c81daf 100644--- a/web/app/components/apps/creators-filter.tsx+++ b/web/app/components/apps/creators-filter.tsx@@ -37,7 +37,7 @@ type CreatorOption = {}const baseChipClassName =- '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 motion-reduce:transition-none'const CreatorsFilter = ({ value, onChange }: CreatorsFilterProps) => {const { t } = useTranslation(['app', 'common'])@@ -122,16 +122,15 @@ const CreatorsFilter = ({ value, onChange }: CreatorsFilterProps) => {<div className="relative inline-flex h-8 items-stretch"><ComboboxTriggerref={triggerRef}- icon={false}aria-label={creatorFilterLabel}className={cn(baseChipClassName,- 'peer/creators-trigger w-auto min-w-0 border-components-button-secondary-border bg-components-button-secondary-bg pr-8 shadow-xs hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-placeholder:border-transparent data-placeholder:bg-components-input-bg-normal data-placeholder:pr-2 data-placeholder:text-text-tertiary data-placeholder:shadow-none data-placeholder:hover:bg-components-input-bg-hover data-popup-open:bg-state-base-hover-alt',+ 'group/creators-trigger peer/creators-trigger w-auto min-w-0 gap-0.5 border-components-button-secondary-border bg-components-button-secondary-bg py-2 pr-8 text-start system-sm-regular shadow-xs hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-placeholder:border-transparent data-placeholder:bg-components-input-bg-normal data-placeholder:pr-2 data-placeholder:text-text-tertiary data-placeholder:shadow-none data-placeholder:hover:bg-components-input-bg-hover data-popup-open:bg-state-base-hover-alt',)}><ComboboxValue<string, true>><span aria-hidden className="flex min-w-0 items-center">- <span className="px-1 text-text-tertiary group-data-popup-open/combobox-trigger:text-text-secondary">+ <span className="px-1 text-text-tertiary group-data-popup-open/creators-trigger:text-text-secondary">{creatorFilterLabel}</span>{selectedCount > 0 ? (@@ -147,10 +146,10 @@ const CreatorsFilter = ({ value, onChange }: CreatorsFilterProps) => {/>))}</span>- <span className="text-xs leading-4 font-medium text-text-tertiary group-data-popup-open/combobox-trigger:text-text-secondary">{`+${selectedCount}`}</span>+ <span className="text-xs leading-4 font-medium text-text-tertiary group-data-popup-open/creators-trigger:text-text-secondary">{`+${selectedCount}`}</span></>) : (- <span className="i-ri-arrow-down-s-line h-4 w-4 shrink-0 text-text-tertiary group-data-popup-open/combobox-trigger:text-text-secondary" />+ <span className="i-ri-arrow-down-s-line h-4 w-4 shrink-0 text-text-tertiary group-data-popup-open/creators-trigger:text-text-secondary" />)}</span><span className="sr-only">{selectedCountLabel}</span>diff --git a/web/app/components/datasets/common/document-picker/index.tsx b/web/app/components/datasets/common/document-picker/index.tsxindex b9b65b86d81..d4d7481dfc8 100644--- a/web/app/components/datasets/common/document-picker/index.tsx+++ b/web/app/components/datasets/common/document-picker/index.tsx@@ -152,10 +152,7 @@ export function DocumentPicker({ datasetId, value, parentMode, onChange }: Props><ComboboxTriggeraria-label={value?.name || t(($) => $['operation.search'], { ns: 'common' })}- icon={false}- className={cn(- 'ml-1 flex size-auto rounded-lg border-0 bg-transparent px-2 py-1 hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-state-base-hover',- )}+ className="ml-1 flex min-w-0 items-center gap-0.5 rounded-lg px-2 py-1 text-start transition-colors hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-state-base-hover motion-reduce:transition-none"><ComboboxValue<SimpleDocumentDetail>>{(document) => <DocumentPickerTriggerValue document={document} parentMode={parentMode} />}diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsxindex 2eb66f7e0d4..fe2a91f05c3 100644--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx@@ -146,8 +146,7 @@ export function AppPicker({><ComboboxTriggeraria-label={t(($) => $['appSelector.label'], { ns: 'app' })}- icon={false}- className="block h-auto w-full border-0 bg-transparent p-0 text-left hover:bg-transparent focus-visible:bg-transparent data-popup-open:bg-transparent"+ className="block w-full min-w-0 rounded-lg text-left data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled">{trigger}</ComboboxTrigger>diff --git a/web/features/agent-v2/agent-detail/logs/components/source-picker.tsx b/web/features/agent-v2/agent-detail/logs/components/source-picker.tsxindex a7816ae6a5f..2365b35722f 100644--- a/web/features/agent-v2/agent-detail/logs/components/source-picker.tsx+++ b/web/features/agent-v2/agent-detail/logs/components/source-picker.tsx@@ -11,6 +11,7 @@ import {ComboboxEmpty,ComboboxGroup,ComboboxGroupLabel,+ ComboboxIcon,ComboboxInput,ComboboxInputGroup,ComboboxItem,@@ -92,22 +93,25 @@ export function AgentLogSourcePicker({><ComboboxTriggeraria-label={t(($) => $['agentDetail.logs.filters.source.label'])}- className="mt-0 w-fit max-w-full min-w-22"+ className="group/source-trigger flex h-8 w-fit max-w-full min-w-22 items-center gap-0.5 rounded-lg bg-components-input-bg-normal px-3 py-2 text-start system-sm-regular text-components-input-text-filled transition-colors hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-placeholder:text-components-input-text-placeholder data-popup-open:bg-state-base-hover-alt motion-reduce:transition-none">- <ComboboxValue<AgentLogSourceResponse['id'], true>- placeholder={t(($) => $['agentDetail.logs.filters.source.all'])}- >- {(selectedValue) => {- if (!selectedValue?.length) return t(($) => $['agentDetail.logs.filters.source.all'])- if (selectedValue.length === 1) {- return (- sourceById.get(selectedValue[0]!)?.app_name ??- tCommon(($) => $['dynamicSelect.selected'], { count: 1 })- )- }- return tCommon(($) => $['dynamicSelect.selected'], { count: selectedValue.length })- }}- </ComboboxValue>+ <span className="min-w-0 grow truncate">+ <ComboboxValue<AgentLogSourceResponse['id'], true>+ placeholder={t(($) => $['agentDetail.logs.filters.source.all'])}+ >+ {(selectedValue) => {+ if (!selectedValue?.length) return t(($) => $['agentDetail.logs.filters.source.all'])+ if (selectedValue.length === 1) {+ return (+ sourceById.get(selectedValue[0]!)?.app_name ??+ tCommon(($) => $['dynamicSelect.selected'], { count: 1 })+ )+ }+ return tCommon(($) => $['dynamicSelect.selected'], { count: selectedValue.length })+ }}+ </ComboboxValue>+ </span>+ <ComboboxIcon className="block text-text-quaternary transition-colors group-hover/source-trigger:text-text-secondary group-data-popup-open/source-trigger:text-text-secondary" /></ComboboxTrigger><ComboboxPortal><ComboboxPositioner>diff --git a/web/features/skills/detail/skill-metadata.tsx b/web/features/skills/detail/skill-metadata.tsxindex 978f6da9bfd..cffd3a9fe00 100644--- a/web/features/skills/detail/skill-metadata.tsx+++ b/web/features/skills/detail/skill-metadata.tsx@@ -230,11 +230,10 @@ export function SkillTagsEditor({}><ComboboxTrigger- icon={false}disabled={!detail || isSavingTags}aria-label={t(($) => $['skillManagement.detail.addTag'])}className={cn(- 'h-4.5 w-auto min-w-4.5 rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm p-0 text-text-tertiary hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-popup-open:bg-state-base-hover',+ 'flex h-4.5 min-w-4.5 items-center justify-center gap-0.5 rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm text-start whitespace-nowrap text-text-tertiary transition-colors hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled data-placeholder:text-components-input-text-placeholder data-disabled:data-placeholder:text-components-input-text-disabled data-popup-open:bg-state-base-hover motion-reduce:transition-none',visibleTags.length === 0 && 'border-dashed px-1.25',)}>diff --git a/web/features/tag-management/components/tag-filter.tsx b/web/features/tag-management/components/tag-filter.tsxindex a50247b331d..14a3104d25a 100644--- a/web/features/tag-management/components/tag-filter.tsx+++ b/web/features/tag-management/components/tag-filter.tsx@@ -102,11 +102,10 @@ export const TagFilter = ({<div className="relative"><ComboboxTriggeraria-label={triggerLabel}- icon={false}className={cn(- 'flex h-8 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal py-0 text-left whitespace-nowrap select-none hover:bg-components-input-bg-normal focus-visible:bg-components-input-bg-normal data-popup-open:bg-components-input-bg-normal',+ 'flex h-8 w-full min-w-0 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal py-0 text-left system-sm-regular whitespace-nowrap select-none',iconOnly- ? 'h-6! w-6! max-w-6! min-w-6! shrink-0 justify-center px-0! py-0! [&>span:first-child]:flex [&>span:first-child]:grow-0'+ ? 'h-6! w-6! max-w-6! min-w-6! shrink-0 justify-center px-0! py-0!': 'max-w-60 min-w-28 px-2',!!value.length && !iconOnly && 'pr-6 shadow-xs',triggerClassName,diff --git a/web/features/tag-management/components/tag-selector.tsx b/web/features/tag-management/components/tag-selector.tsxindex 71f2f85de39..00632dffda9 100644--- a/web/features/tag-management/components/tag-selector.tsx+++ b/web/features/tag-management/components/tag-selector.tsx@@ -268,10 +268,9 @@ export const TagSelector = ({disabled={!canManageTags && !canBindOrUnbindTags}aria-label={accessibleTriggerLabel}className={cn(- 'group/tag-area relative h-auto w-full cursor-pointer rounded-lg border-0 bg-transparent p-1 hover:bg-state-base-hover focus-visible:bg-transparent data-disabled:bg-transparent data-disabled:opacity-50 data-disabled:hover:bg-transparent data-popup-open:bg-state-base-hover data-popup-open:hover:bg-state-base-hover',+ 'group/tag-area relative flex w-full min-w-0 cursor-pointer items-center gap-0.5 rounded-lg p-1 text-start transition-colors hover:bg-state-base-hover data-disabled:cursor-not-allowed data-disabled:opacity-50 data-disabled:hover:bg-transparent data-popup-open:bg-state-base-hover motion-reduce:transition-none',className,)}- icon={false}onClick={onClick}><TagTriggerContent tags={tagNames} emptyLabel={emptyTriggerLabel} />diff --git a/web/features/tag-management/components/tag-trigger-content.tsx b/web/features/tag-management/components/tag-trigger-content.tsxindex d65a3c81f0b..353b08efa3a 100644--- a/web/features/tag-management/components/tag-trigger-content.tsx+++ b/web/features/tag-management/components/tag-trigger-content.tsx@@ -5,7 +5,7 @@ type TagTriggerContentProps = {export const TagTriggerContent = ({ tags, emptyLabel }: TagTriggerContentProps) => {return (- <span aria-hidden="true" className="flex w-full min-w-0 items-center gap-1">+ <span aria-hidden="true" className="flex w-full min-w-0 items-center gap-1 overflow-hidden">{!tags.length ? (<span className="flex max-w-full min-w-0 items-center gap-x-0.5 rounded-[5px] border border-dashed border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75"><span className="i-ri-price-tag-3-line size-3 shrink-0 text-text-quaternary" />