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): clarify type ownership and internal module boundaries (#43916)
yyh154fd960a08b
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.jsonindex d6814817438..5b459cc6e77 100644--- a/oxlint-suppressions.json+++ b/oxlint-suppressions.json@@ -2090,11 +2090,6 @@"count": 1}},- "web/app/components/plugins/plugin-auth/authorized/index.tsx": {- "no-restricted-imports": {- "count": 1- }- },"web/app/components/plugins/plugin-auth/authorized/item.tsx": {"jsx-a11y/click-events-have-key-events": {"count": 1diff --git a/packages/dify-ui/AGENTS.md b/packages/dify-ui/AGENTS.mdindex 4ba93f699b2..83cfaddb334 100644--- a/packages/dify-ui/AGENTS.md+++ b/packages/dify-ui/AGENTS.md@@ -11,7 +11,8 @@ This file owns the package boundary. Read the matching contract guide below direskills may reference these guides; these guides must not require Web docs or skills to define package behavior.- Prefer `@base-ui/react` when it owns the required headless behavior. Style primitives with `cva`,`cn`, and Dify design tokens. Keep one primitive per `src/<name>/` folder with optional colocated- stories and tests.+ stories and tests. A cohesive family may use `src/<family>/<primitive>/` public entrypoints,+ with family-shared implementation in `src/<family>/internal/`.- Prefer Base UI data attributes for state styling and CSS variables for exposed dynamic values.Follow [Styling] for state callbacks; do not mirror primitive state in React solely to add classes.- When an upstream API or selector contract is unclear, read the current official Base UIdiff --git a/packages/dify-ui/docs/authoring.md b/packages/dify-ui/docs/authoring.mdindex 0a8691f9718..41bd413164d 100644--- a/packages/dify-ui/docs/authoring.md+++ b/packages/dify-ui/docs/authoring.md@@ -11,6 +11,9 @@ Import a Base UI part once per module and read its types from that binding's nam`BaseRadio.Root.Props`. Use `import type` only when the module has no runtime use of the part. Donot keep a value import and a type import of the same module side by side.+Add a public utility subpath only when an application consumer needs it. Inside the package,+use an existing utility entrypoint; otherwise import directly from `@base-ui/utils`.+## React importsUse React namespace imports throughout this package, including stories and tests. Use@@ -33,6 +36,10 @@ expressions when JavaScript cannot infer their name. Use `event` or `error` instEvery public primitive needs a matching `package.json#exports` subpath. Import relatively betweenpackage components; consumers import only through public subpaths.+Keep package-private helpers in `src/internal/`; top-level runtime utility modules in `src/` are+public utility subpaths. Components share code through the owning component's entrypoint or an+explicit internal module, not another component's implementation files.+Use the primitive name without a `Root` suffix for the canonical boundary and matching props type:`Select` and `SelectProps`, `Drawer` and `DrawerProps`. Keep `Root` only when the same subpathexports both low-level anatomy and a higher-level convenience component, such as `AvatarRoot`@@ -70,7 +77,8 @@ real consumer must name it independently.State, controlled-state helpers, context values, render helpers, styling helpers, and upstreampassthrough aliases are private by default. Public props already provide contextual typing for-inline render and event callbacks.+inline render and event callbacks. Expose styling helpers only when consumers need to reuse+appearance independently.Event details and reasons are the exception. A component that aliases or wraps a Base UI partre-exports that part's `*EventDetails` and `*EventReason` types under its own name. A compositediff --git a/packages/dify-ui/docs/styling.md b/packages/dify-ui/docs/styling.mdindex bdd60f0130f..ad3efa9daff 100644--- a/packages/dify-ui/docs/styling.md+++ b/packages/dify-ui/docs/styling.md@@ -66,6 +66,11 @@ after the owning variant, data attribute, and selector structure cannot express## Focus indicator+`src/internal/focus.ts` owns the outer and inset focus-visible rings and the separated indicator+for checked controls. Both ring constants include `focus-visible:outline-hidden`; do not repeat+outline handling at their call sites. A package-wide interaction contract can have a shared style+owner; visual similarity alone is not a reason to share constants. Keep component-specific selectors local.+Controls own their focus indicator, so callers never write one. That includes every trigger thatopens a surface (Popover, DropdownMenu, Collapsible, Combobox, Dialog, AlertDialog, Drawer); theyshare one ring. Rows inside a composite defer to its highlight. Parts that only attach behaviordiff --git a/packages/dify-ui/src/alert-dialog/index.tsx b/packages/dify-ui/src/alert-dialog/index.tsxindex f25ea6bec82..12b5121dd6d 100644--- a/packages/dify-ui/src/alert-dialog/index.tsx+++ b/packages/dify-ui/src/alert-dialog/index.tsx@@ -5,12 +5,9 @@ import type { ButtonProps } from '../button'import { AlertDialog as BaseAlertDialog } from '@base-ui/react/alert-dialog'import { Button } from '../button'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import {- modalBackdropClassName,- modalPopupAnimationClassName,- triggerFocusClassName,-} from '../overlay-shared'+import { focusRingClassName } from '../internal/focus'+import { modalBackdropClassName, modalPopupAnimationClassName } from '../internal/overlay'+import { resolveClassName } from '../internal/resolve-class-name'const AlertDialog = BaseAlertDialog.Rootconst AlertDialogTitle = BaseAlertDialog.Title@@ -31,7 +28,7 @@ function AlertDialogTrigger<Payload = unknown>({}: AlertDialogTriggerProps<Payload>) {return (<BaseAlertDialog.Trigger- className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)diff --git a/packages/dify-ui/src/autocomplete/index.tsx b/packages/dify-ui/src/autocomplete/index.tsxindex 23710b37462..a5d0497c9a3 100644--- a/packages/dify-ui/src/autocomplete/index.tsx+++ b/packages/dify-ui/src/autocomplete/index.tsx@@ -2,19 +2,20 @@import type { VariantProps } from 'class-variance-authority'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { textControlGroupClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { insetFocusRingClassName } from '../internal/focus'+import { textControlGroupClassName } from '../internal/form-control'import {floatingGroupLabelClassName,floatingItemIndicatorClassName,floatingPopupAnimationClassName,floatingSeparatorClassName,-} from '../overlay-shared'-import { parsePlacement } from '../placement'+} from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'type AutocompleteActions = BaseAutocomplete.Root.Actions@@ -72,10 +73,12 @@ function AutocompleteCollection<Value = unknown>(props: AutocompleteCollectionPr// The popup is limited to the available height and lays its parts out in a column, so a status or input// sharing it with the list leaves the list to shrink. The popup scrolls only when nothing can.+// Same layout as `ComboboxPopup`; keep the two local definitions aligned.const autocompletePopupClassName = ['flex max-h-(--available-height) w-(--anchor-width) max-w-[min(28rem,var(--available-width))] flex-col overflow-x-hidden overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg outline-hidden',]+// Same layout as `ComboboxList`; keep the two local definitions aligned.const autocompleteListClassName = ['max-h-[min(20rem,var(--available-height))] overflow-y-auto overflow-x-hidden overscroll-contain p-1 outline-hidden scroll-py-1','data-empty:max-h-none data-empty:p-0',@@ -167,11 +170,11 @@ function AutocompleteInput({const autocompleteControlVariants = cva([- 'flex shrink-0 touch-manipulation items-center justify-center rounded-md text-text-tertiary outline-hidden transition-colors',+ 'flex shrink-0 touch-manipulation items-center justify-center rounded-md text-text-tertiary transition-colors','hover:bg-components-input-bg-hover hover:text-text-secondary focus-visible:bg-components-input-bg-hover focus-visible:text-text-secondary',- 'focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',- 'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:hover:text-text-tertiary disabled:focus-visible:bg-transparent disabled:focus-visible:ring-0',- 'group-data-disabled/autocomplete:cursor-not-allowed group-data-disabled/autocomplete:hover:bg-transparent group-data-disabled/autocomplete:focus-visible:bg-transparent group-data-disabled/autocomplete:focus-visible:ring-0',+ insetFocusRingClassName,+ 'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:hover:text-text-tertiary disabled:focus-visible:bg-transparent',+ 'group-data-disabled/autocomplete:cursor-not-allowed group-data-disabled/autocomplete:hover:bg-transparent group-data-disabled/autocomplete:focus-visible:bg-transparent','group-data-readonly/autocomplete:hidden','motion-reduce:transition-none',],diff --git a/packages/dify-ui/src/avatar/index.tsx b/packages/dify-ui/src/avatar/index.tsxindex 5f1ba7fc8ae..bb7528bc5ee 100644--- a/packages/dify-ui/src/avatar/index.tsx+++ b/packages/dify-ui/src/avatar/index.tsx@@ -1,9 +1,8 @@'use client'-import type { ImageLoadingStatus } from '@base-ui/react/avatar'import { Avatar as BaseAvatar } from '@base-ui/react/avatar'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { resolveClassName } from '../internal/resolve-class-name'const avatarSizeClasses = {xxs: { root: 'size-4', text: 'text-[7px]' },@@ -18,12 +17,11 @@ const avatarSizeClasses = {type AvatarSize = keyof typeof avatarSizeClasses-type AvatarProps = {+type AvatarProps = Pick<BaseAvatar.Image.Props, 'onLoadingStatusChange'> & {name: stringavatar: string | nullsize?: AvatarSizeclassName?: string- onLoadingStatusChange?: (status: ImageLoadingStatus) => void}type AvatarRootProps = BaseAvatar.Root.Props & {diff --git a/packages/dify-ui/src/breadcrumb/index.tsx b/packages/dify-ui/src/breadcrumb/index.tsxindex 91fdf4bc092..ba2a5acd814 100644--- a/packages/dify-ui/src/breadcrumb/index.tsx+++ b/packages/dify-ui/src/breadcrumb/index.tsx@@ -1,9 +1,10 @@'use client'import type * as React from 'react'-import { mergeProps } from '@base-ui/react/merge-props'-import { useRender } from '@base-ui/react/use-render'import { cn } from '../cn'+import { focusRingClassName } from '../internal/focus'+import { mergeProps } from '../merge-props'+import { useRender } from '../use-render'type BreadcrumbName =| { 'aria-label': string; 'aria-labelledby'?: never }@@ -44,7 +45,8 @@ function BreadcrumbLink({ className, render, ...props }: BreadcrumbLinkProps) {props: mergeProps<'a'>({className: cn(- 'inline-flex min-w-0 items-center gap-1 rounded-sm whitespace-nowrap text-text-tertiary hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden aria-[current=page]:text-text-primary',+ focusRingClassName,+ 'inline-flex min-w-0 items-center gap-1 rounded-sm whitespace-nowrap text-text-tertiary hover:text-text-secondary aria-[current=page]:text-text-primary',className,),},diff --git a/packages/dify-ui/src/button/index.tsx b/packages/dify-ui/src/button/index.tsxindex 72278558630..95870d984b3 100644--- a/packages/dify-ui/src/button/index.tsx+++ b/packages/dify-ui/src/button/index.tsx@@ -4,10 +4,14 @@ import type { VariantProps } from 'class-variance-authority'import { Button as BaseButton } from '@base-ui/react/button'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { focusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'const buttonVariants = cva(- 'inline-flex cursor-pointer items-center justify-center overflow-hidden whitespace-nowrap focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-disabled:cursor-not-allowed',+ [+ focusRingClassName,+ 'inline-flex cursor-pointer items-center justify-center overflow-hidden whitespace-nowrap data-disabled:cursor-not-allowed',+ ],{variants: {variant: {diff --git a/packages/dify-ui/src/checkbox/index.stories.tsx b/packages/dify-ui/src/checkbox/index.stories.tsxindex 3d9e7db080f..ee0218841e3 100644--- a/packages/dify-ui/src/checkbox/index.stories.tsx+++ b/packages/dify-ui/src/checkbox/index.stories.tsx@@ -1,4 +1,5 @@import type { Meta, StoryObj } from '@storybook/react-vite'+import type { CheckboxProps } from '.'import * as React from 'react'import { Checkbox, CheckboxSkeleton } from '.'@@ -39,7 +40,7 @@ const meta = {export default metatype Story = StoryObj<typeof meta>-function CheckboxDemo(args: Partial<React.ComponentProps<typeof Checkbox>>) {+function CheckboxDemo(args: Partial<CheckboxProps>) {const [checked, setChecked] = React.useState(args.checked ?? false)return (diff --git a/packages/dify-ui/src/checkbox/index.tsx b/packages/dify-ui/src/checkbox/index.tsxindex 64e95196e96..588d33c7ebd 100644--- a/packages/dify-ui/src/checkbox/index.tsx+++ b/packages/dify-ui/src/checkbox/index.tsx@@ -3,8 +3,8 @@import type * as React from 'react'import { Checkbox as BaseCheckbox } from '@base-ui/react/checkbox'import { cn } from '../cn'-import { checkedControlFocusClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { checkedControlFocusClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'const checkboxRootClassName = cn('inline-flex size-4 shrink-0 touch-manipulation items-center justify-center rounded-sm shadow-xs shadow-shadow-shadow-3 transition-colors motion-reduce:transition-none',diff --git a/packages/dify-ui/src/collapsible/index.tsx b/packages/dify-ui/src/collapsible/index.tsxindex 80c5c172790..cce25fba53d 100644--- a/packages/dify-ui/src/collapsible/index.tsx+++ b/packages/dify-ui/src/collapsible/index.tsx@@ -2,8 +2,8 @@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'+import { focusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'type CollapsibleProps = BaseCollapsible.Root.Propstype CollapsibleChangeEventReason = BaseCollapsible.Root.ChangeEventReason@@ -21,7 +21,7 @@ type CollapsibleTriggerProps = BaseCollapsible.Trigger.Propsfunction CollapsibleTrigger({ className, ...props }: CollapsibleTriggerProps) {return (<BaseCollapsible.Trigger- className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)diff --git a/packages/dify-ui/src/combobox/index.tsx b/packages/dify-ui/src/combobox/index.tsxindex 7949828c0cd..bcc69b7fd90 100644--- a/packages/dify-ui/src/combobox/index.tsx+++ b/packages/dify-ui/src/combobox/index.tsx@@ -2,20 +2,20 @@import type { VariantProps } from 'class-variance-authority'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { Combobox as BaseCombobox } from '@base-ui/react/combobox'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { formLabelClassName, textControlGroupClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { focusRingClassName, insetFocusRingClassName } from '../internal/focus'+import { formLabelClassName, textControlGroupClassName } from '../internal/form-control'import {floatingGroupLabelClassName,floatingItemIndicatorClassName,floatingPopupAnimationClassName,floatingSeparatorClassName,- triggerFocusClassName,-} from '../overlay-shared'-import { parsePlacement } from '../placement'+} from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'type ComboboxActions = BaseCombobox.Root.Actions@@ -81,10 +81,12 @@ type ComboboxRowProps = BaseCombobox.Row.Props// The popup is limited to the available height and lays its parts out in a column, so an input or status// sharing it with the list leaves the list to shrink. The popup scrolls only when nothing can.+// Same layout as `AutocompletePopup`; keep the two local definitions aligned.const comboboxPopupClassName = ['flex max-h-(--available-height) w-(--anchor-width) max-w-[min(28rem,var(--available-width))] flex-col overflow-x-hidden overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg outline-hidden',]+// Same layout as `AutocompleteList`; keep the two local definitions aligned.const comboboxListClassName = ['max-h-[min(20rem,var(--available-height))] overflow-y-auto overflow-x-hidden overscroll-contain p-1 outline-hidden scroll-py-1','data-empty:max-h-none data-empty:p-0',@@ -105,7 +107,7 @@ function ComboboxTrigger({ className, type = 'button', ...props }: ComboboxTriggreturn (<BaseCombobox.Triggertype={type}- className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)@@ -193,11 +195,11 @@ function ComboboxInput({const comboboxControlVariants = cva([- 'flex shrink-0 touch-manipulation items-center justify-center rounded-md text-text-tertiary outline-hidden transition-colors',+ 'flex shrink-0 touch-manipulation items-center justify-center rounded-md text-text-tertiary transition-colors','hover:bg-components-input-bg-hover hover:text-text-secondary focus-visible:bg-components-input-bg-hover focus-visible:text-text-secondary',- 'focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',- 'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:hover:text-text-tertiary disabled:focus-visible:bg-transparent disabled:focus-visible:ring-0',- 'group-data-disabled/combobox:cursor-not-allowed group-data-disabled/combobox:hover:bg-transparent group-data-disabled/combobox:focus-visible:bg-transparent group-data-disabled/combobox:focus-visible:ring-0',+ insetFocusRingClassName,+ 'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:hover:text-text-tertiary disabled:focus-visible:bg-transparent',+ 'group-data-disabled/combobox:cursor-not-allowed group-data-disabled/combobox:hover:bg-transparent group-data-disabled/combobox:focus-visible:bg-transparent','group-data-readonly/combobox:hidden','motion-reduce:transition-none',],@@ -488,7 +490,8 @@ function ComboboxChipRemove({}className={(state) =>cn(- 'flex size-3.5 shrink-0 items-center justify-center rounded-sm text-text-tertiary outline-hidden hover:bg-state-base-hover-alt hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid',+ 'flex size-3.5 shrink-0 items-center justify-center rounded-sm text-text-tertiary hover:bg-state-base-hover-alt hover:text-text-secondary',+ focusRingClassName,resolveClassName(className, state),)}diff --git a/packages/dify-ui/src/context-menu/index.tsx b/packages/dify-ui/src/context-menu/index.tsxindex b17287b46e7..f7ced75dd4b 100644--- a/packages/dify-ui/src/context-menu/index.tsx+++ b/packages/dify-ui/src/context-menu/index.tsx@@ -1,21 +1,24 @@'use client'import type * as React from 'react'-import type { MenuItemVariant } from '../overlay-shared'-import type { Placement } from '../placement'+import type { MenuItemVariant } from '../internal/menu'+import type { Placement } from '../internal/placement'import { ContextMenu as BaseContextMenu } from '@base-ui/react/context-menu'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import {+ menuItemClassName,+ menuItemDestructiveClassName,+ menuPopupBaseClassName,+ menuPopupSurfaceClassName,+} from '../internal/menu'import {floatingGroupLabelClassName,floatingItemIndicatorClassName,floatingPopupAnimationClassName,floatingSeparatorClassName,- menuItemClassName,- menuItemDestructiveClassName,- menuPopupClassName,-} from '../overlay-shared'-import { parsePlacement } from '../placement'+} from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'const ContextMenu = BaseContextMenu.Rootconst ContextMenuTrigger = BaseContextMenu.Trigger@@ -77,7 +80,8 @@ function ContextMenuContent({<BaseContextMenu.PopupclassName={(state) =>cn(- menuPopupClassName,+ menuPopupBaseClassName,+ menuPopupSurfaceClassName,floatingPopupAnimationClassName,resolveClassName(className, state),)@@ -245,7 +249,8 @@ function ContextMenuSubContent({<BaseContextMenu.PopupclassName={(state) =>cn(- menuPopupClassName,+ menuPopupBaseClassName,+ menuPopupSurfaceClassName,floatingPopupAnimationClassName,resolveClassName(className, state),)diff --git a/packages/dify-ui/src/date-time/date-picker/index.tsx b/packages/dify-ui/src/date-time/date-picker/index.tsxindex b19ef7b597f..f4c07f88f30 100644--- a/packages/dify-ui/src/date-time/date-picker/index.tsx+++ b/packages/dify-ui/src/date-time/date-picker/index.tsx@@ -1,6 +1,6 @@'use client'-import type { CalendarPanelLabels, CalendarPanelProps } from '../date-picker/calendar-panel'+import type { CalendarPanelLabels, CalendarPanelProps } from '../internal/calendar-panel'import type {PickerClearProps,PickerContentProps,@@ -12,8 +12,8 @@ import type {import { useControlled } from '@base-ui/utils/useControlled'import { enUS } from '@daypicker/react/locale/en-US'import * as React from 'react'-import { CalendarPanel } from '../date-picker/calendar-panel'-import { formatDateValue, getInitialMonth, requireDateValue } from '../date-picker/date-value'+import { CalendarPanel } from '../internal/calendar-panel'+import { formatDateValue, getInitialMonth, requireDateValue } from '../internal/date-value'import {PickerClear,PickerContent,@@ -69,7 +69,7 @@ function DatePicker({default: defaultValue,name: 'DatePicker',})- requireDateValue(value)+ const parsedValue = requireDateValue(value)if (props.minDate) requireDateValue(props.minDate)if (props.maxDate) requireDateValue(props.maxDate)if (props.minDate && props.maxDate && props.minDate > props.maxDate)@@ -99,14 +99,14 @@ function DatePicker({}placeholder={props.placeholder ?? 'Select date'}displayValue={- value+ parsedValue? new Intl.DateTimeFormat(props.locale?.code ?? 'en-US', {year: 'numeric',calendar: 'gregory',month: 'short',day: 'numeric',timeZone: 'UTC',- }).format(requireDateValue(value)!)+ }).format(parsedValue): ''}serializedValue={value ?? ''}diff --git a/packages/dify-ui/src/date-time/date-time-picker/index.tsx b/packages/dify-ui/src/date-time/date-time-picker/index.tsxindex 86db21d5a19..f1613effcab 100644--- a/packages/dify-ui/src/date-time/date-time-picker/index.tsx+++ b/packages/dify-ui/src/date-time/date-time-picker/index.tsx@@ -1,6 +1,6 @@'use client'-import type { CalendarPanelLabels, CalendarPanelProps } from '../date-picker/calendar-panel'+import type { CalendarPanelLabels, CalendarPanelProps } from '../internal/calendar-panel'import type {PickerClearProps,PickerContentProps,@@ -9,14 +9,14 @@ import type {PickerTriggerProps,PickerValueProps,} from '../internal/picker-parts'-import type { TimePanelLabels, TimePanelProps } from '../time-picker/time-panel'+import type { TimePanelLabels, TimePanelProps } from '../internal/time-panel'import type { ZonedWallTime } from './zoned-value'import { useControlled } from '@base-ui/utils/useControlled'import { enUS } from '@daypicker/react/locale/en-US'import * as React from 'react'import { Button } from '../../button'-import { CalendarPanel } from '../date-picker/calendar-panel'-import { getInitialMonth, requireDateValue } from '../date-picker/date-value'+import { CalendarPanel } from '../internal/calendar-panel'+import { getInitialMonth, requireDateValue } from '../internal/date-value'import { PickerPanel, PickerPanelHeader } from '../internal/picker-panel'import {PickerClear,@@ -27,7 +27,7 @@ import {PickerValue,usePickerContext,} from '../internal/picker-parts'-import { TimePanel } from '../time-picker/time-panel'+import { TimePanel } from '../internal/time-panel'import { getZonedWallTime, resolveZonedWallTime } from './zoned-value'type DateTimePickerLabels = CalendarPanelLabels &diff --git a/packages/dify-ui/src/date-time/date-time-picker/zoned-value.ts b/packages/dify-ui/src/date-time/date-time-picker/zoned-value.tsindex 17bb32f5db8..444c957c874 100644--- a/packages/dify-ui/src/date-time/date-time-picker/zoned-value.ts+++ b/packages/dify-ui/src/date-time/date-time-picker/zoned-value.ts@@ -1,6 +1,6 @@import { TZDate, tzOffset, tzScan } from '@date-fns/tz'-import { parseDateValue } from '../date-picker/date-value'-import { parseTimeValue } from '../time-picker/time-value'+import { parseDateValue } from '../internal/date-value'+import { parseTimeValue } from '../internal/time-value'type ZonedWallTime = { date: string; time: string }diff --git a/packages/dify-ui/src/date-time/date-picker/__tests__/date-value.spec.ts b/packages/dify-ui/src/date-time/internal/__tests__/date-value.spec.tssimilarity index 100%rename from packages/dify-ui/src/date-time/date-picker/__tests__/date-value.spec.tsrename to packages/dify-ui/src/date-time/internal/__tests__/date-value.spec.tsdiff --git a/packages/dify-ui/src/date-time/date-picker/calendar-grid.tsx b/packages/dify-ui/src/date-time/internal/calendar-grid.tsxsimilarity index 98%rename from packages/dify-ui/src/date-time/date-picker/calendar-grid.tsxrename to packages/dify-ui/src/date-time/internal/calendar-grid.tsxindex 248f9541550..23479cedf94 100644--- a/packages/dify-ui/src/date-time/date-picker/calendar-grid.tsx+++ b/packages/dify-ui/src/date-time/internal/calendar-grid.tsx@@ -59,7 +59,8 @@ function CalendarNavigation({onNextClick,...navProps}: NavProps) {- const navigation = React.useContext(NavigationContext)!+ const navigation = React.useContext(NavigationContext)+ if (!navigation) throw new Error('CalendarNavigation requires CalendarGrid.')return (<nav {...navProps} className="flex h-10 items-center justify-between px-2 pt-2">{navigation.monthTrigger}diff --git a/packages/dify-ui/src/date-time/date-picker/calendar-panel.tsx b/packages/dify-ui/src/date-time/internal/calendar-panel.tsxsimilarity index 98%rename from packages/dify-ui/src/date-time/date-picker/calendar-panel.tsxrename to packages/dify-ui/src/date-time/internal/calendar-panel.tsxindex d453dafdf84..866caad87fc 100644--- a/packages/dify-ui/src/date-time/date-picker/calendar-panel.tsx+++ b/packages/dify-ui/src/date-time/internal/calendar-panel.tsx@@ -1,10 +1,10 @@import type { DayPickerProps } from '@daypicker/react'import * as React from 'react'import { Button } from '../../button'-import { OptionColumn } from '../internal/option-column'-import { PickerColumns, PickerPanel, PickerPanelHeader } from '../internal/picker-panel'-import { usePickerNumbers } from '../internal/use-picker-numbers'import { CalendarGrid, toCalendarDate } from './calendar-grid'+import { OptionColumn } from './option-column'+import { PickerColumns, PickerPanel, PickerPanelHeader } from './picker-panel'+import { usePickerNumbers } from './use-picker-numbers'type CalendarPanelLabels = {previousMonth: stringdiff --git a/packages/dify-ui/src/date-time/date-picker/date-value.ts b/packages/dify-ui/src/date-time/internal/date-value.tssimilarity index 100%rename from packages/dify-ui/src/date-time/date-picker/date-value.tsrename to packages/dify-ui/src/date-time/internal/date-value.tsdiff --git a/packages/dify-ui/src/date-time/internal/option-column.tsx b/packages/dify-ui/src/date-time/internal/option-column.tsxindex c9dfe2c91c0..affaec2e5f4 100644--- a/packages/dify-ui/src/date-time/internal/option-column.tsx+++ b/packages/dify-ui/src/date-time/internal/option-column.tsx@@ -101,9 +101,9 @@ function OptionColumn({// A positioning scroll that never reaches its target was taken over; rest decides.if (positioning || !supportsScrollEnd) quietTimer.start(150, () => finishScroll())}- function onScrollEnd() {+ const onScrollEnd = function onScrollEnd() {const { target } = scrollRef.current- if (target === null || Math.abs(column!.scrollTop - target) < 1) finishScroll()+ if (target === null || Math.abs(column.scrollTop - target) < 1) finishScroll()}column.addEventListener('scroll', onScroll, { passive: true })if (supportsScrollEnd) column.addEventListener('scrollend', onScrollEnd)@@ -168,7 +168,9 @@ function OptionColumn({event.stopPropagation()const currentOption = scrollRef.current.moved? nearestOption()- : (event.target as HTMLElement)+ : event.target instanceof HTMLElement+ ? event.target+ : undefinedconst currentValue = Number(currentOption?.dataset.optionValue)const currentIndex = Math.max(0,@@ -219,8 +221,8 @@ function OptionColumn({: undefinedif (!numeric) {for (let offset = 0; offset < options.length; offset++) {- const option = options[(startIndex + offset) % options.length]!- if (option.label.toLowerCase().startsWith(text)) {+ const option = options[(startIndex + offset) % options.length]+ if (option?.label.toLowerCase().startsWith(text)) {match = optionbreak}diff --git a/packages/dify-ui/src/date-time/internal/picker-parts.tsx b/packages/dify-ui/src/date-time/internal/picker-parts.tsxindex d860cc3b390..6f4b50dc844 100644--- a/packages/dify-ui/src/date-time/internal/picker-parts.tsx+++ b/packages/dify-ui/src/date-time/internal/picker-parts.tsx@@ -1,29 +1,28 @@'use client'+import type { TextDirection } from '../../direction-provider'import type { IconButtonProps } from '../../icon-button'import type {PopoverActions,+ PopoverChangeEventDetails,PopoverContentProps,PopoverProps,PopoverTriggerProps,} from '../../popover'-import { useMergedRefs } from '@base-ui/utils/useMergedRefs'import * as React from 'react'import { cn } from '../../cn'import { DirectionProvider, useDirection } from '../../direction-provider'-import { formLabelClassName } from '../../form-control-shared'import { IconButton } from '../../icon-button'-import { resolveClassName } from '../../internals/resolve-class-name'+import { formLabelClassName } from '../../internal/form-control'+import { resolveClassName } from '../../internal/resolve-class-name'import { Popover, PopoverContent, PopoverTrigger } from '../../popover'+import { useMergedRefs } from '../../use-merged-refs'-type PickerOpenChangeDetails = Omit<- Parameters<NonNullable<PopoverProps['onOpenChange']>>[1],- 'preventUnmountOnClose'->+type PickerOpenChangeDetails = Omit<PopoverChangeEventDetails, 'preventUnmountOnClose'>type PickerFieldProps = Pick<PopoverProps, 'open' | 'defaultOpen'> & {/** Overrides DirectionProvider for this field and its popup; independent of locale. */- direction?: DirectionProvider.Props['direction']+ direction?: TextDirectionplaceholder?: stringdisabled?: booleanreadOnly?: booleandiff --git a/packages/dify-ui/src/date-time/time-picker/time-panel.tsx b/packages/dify-ui/src/date-time/internal/time-panel.tsxsimilarity index 90%rename from packages/dify-ui/src/date-time/time-picker/time-panel.tsxrename to packages/dify-ui/src/date-time/internal/time-panel.tsxindex 9eba2758901..baa0e0daffb 100644--- a/packages/dify-ui/src/date-time/time-picker/time-panel.tsx+++ b/packages/dify-ui/src/date-time/internal/time-panel.tsx@@ -1,8 +1,8 @@import * as React from 'react'-import { OptionColumn } from '../internal/option-column'-import { PickerColumns } from '../internal/picker-panel'-import { usePickerNumbers } from '../internal/use-picker-numbers'+import { OptionColumn } from './option-column'+import { PickerColumns } from './picker-panel'import { formatTimeValue, parseTimeValue } from './time-value'+import { usePickerNumbers } from './use-picker-numbers'type TimePanelLabels = { hour: string; minute: string; period: string; am: string; pm: string }type TimePanelProps = {@@ -31,7 +31,8 @@ function TimePanel({const displayHour = hourCycle === 24 ? current.hour : current.hour % 12 || 12function update(part: 'hour' | 'minute' | 'period', next: number) {onValueChange((previous) => {- const time = parseTimeValue(previous)!+ const time = parseTimeValue(previous)+ if (!time) throw new RangeError(`Invalid time of day: ${previous}`)if (part === 'minute') time.minute = nextelse if (part === 'period') time.hour = (time.hour % 12) + next * 12else time.hour = hourCycle === 24 ? next : (next % 12) + Math.floor(time.hour / 12) * 12diff --git a/packages/dify-ui/src/date-time/time-picker/time-value.ts b/packages/dify-ui/src/date-time/internal/time-value.tssimilarity index 100%rename from packages/dify-ui/src/date-time/time-picker/time-value.tsrename to packages/dify-ui/src/date-time/internal/time-value.tsdiff --git a/packages/dify-ui/src/date-time/time-picker/index.tsx b/packages/dify-ui/src/date-time/time-picker/index.tsxindex fba9e406df3..1725872677a 100644--- a/packages/dify-ui/src/date-time/time-picker/index.tsx+++ b/packages/dify-ui/src/date-time/time-picker/index.tsx@@ -8,7 +8,7 @@ import type {PickerTriggerProps,PickerValueProps,} from '../internal/picker-parts'-import type { TimePanelLabels, TimePanelProps } from '../time-picker/time-panel'+import type { TimePanelLabels, TimePanelProps } from '../internal/time-panel'import { useControlled } from '@base-ui/utils/useControlled'import { TZDate } from '@date-fns/tz'import * as React from 'react'@@ -23,8 +23,8 @@ import {PickerValue,usePickerContext,} from '../internal/picker-parts'-import { TimePanel } from '../time-picker/time-panel'-import { formatTimeValue, requireTimeValue } from '../time-picker/time-value'+import { TimePanel } from '../internal/time-panel'+import { formatTimeValue, requireTimeValue } from '../internal/time-value'type TimePickerLabels = TimePanelLabels & {title: stringdiff --git a/packages/dify-ui/src/dialog/index.tsx b/packages/dify-ui/src/dialog/index.tsxindex 2e2057dcdac..36753e7f84d 100644--- a/packages/dify-ui/src/dialog/index.tsx+++ b/packages/dify-ui/src/dialog/index.tsx@@ -3,12 +3,9 @@import type * as React from 'react'import { Dialog as BaseDialog } from '@base-ui/react/dialog'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import {- modalBackdropClassName,- modalPopupAnimationClassName,- triggerFocusClassName,-} from '../overlay-shared'+import { focusRingClassName } from '../internal/focus'+import { modalBackdropClassName, modalPopupAnimationClassName } from '../internal/overlay'+import { resolveClassName } from '../internal/resolve-class-name'const Dialog = BaseDialog.Rootconst DialogTitle = BaseDialog.Title@@ -28,7 +25,7 @@ type DialogTriggerProps<Payload = unknown> = BaseDialog.Trigger.Props<Payload>function DialogTrigger<Payload = unknown>({ className, ...props }: DialogTriggerProps<Payload>) {return (<BaseDialog.Trigger- className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)diff --git a/packages/dify-ui/src/direction-provider/index.tsx b/packages/dify-ui/src/direction-provider/index.tsxindex 7b3a072b021..d530d1d33e2 100644--- a/packages/dify-ui/src/direction-provider/index.tsx+++ b/packages/dify-ui/src/direction-provider/index.tsx@@ -1,4 +1,4 @@'use client'export { DirectionProvider, useDirection } from '@base-ui/react/direction-provider'-export type { DirectionProviderProps } from '@base-ui/react/direction-provider'+export type { DirectionProviderProps, TextDirection } from '@base-ui/react/direction-provider'diff --git a/packages/dify-ui/src/drawer/index.stories.tsx b/packages/dify-ui/src/drawer/index.stories.tsxindex 79ffb55bbe3..05967e74aea 100644--- a/packages/dify-ui/src/drawer/index.stories.tsx+++ b/packages/dify-ui/src/drawer/index.stories.tsx@@ -1,5 +1,5 @@import type { Meta, StoryObj } from '@storybook/react-vite'-import type { DrawerProps } from '.'+import type { DrawerSnapPoint } from '.'import * as React from 'react'import {createDrawerHandle,@@ -332,7 +332,6 @@ export const Positions: Story = {const snapTopMarginRem = 1const visibleSnapPointRem = 30-type DrawerSnapPoint = NonNullable<DrawerProps['snapPoints']>[number]const initialSnapPoint: DrawerSnapPoint = `${visibleSnapPointRem + snapTopMarginRem}rem`const snapPoints = [initialSnapPoint, 1] satisfies DrawerSnapPoint[]diff --git a/packages/dify-ui/src/drawer/index.tsx b/packages/dify-ui/src/drawer/index.tsxindex d40338b8fae..17d1abdae2e 100644--- a/packages/dify-ui/src/drawer/index.tsx+++ b/packages/dify-ui/src/drawer/index.tsx@@ -2,8 +2,8 @@import { Drawer as BaseDrawer } from '@base-ui/react/drawer'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import { triggerFocusClassName } from '../overlay-shared'+import { focusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'const Drawer = BaseDrawer.Rootconst DrawerProvider = BaseDrawer.Provider@@ -17,6 +17,7 @@ const DrawerClose = BaseDrawer.Closeconst createDrawerHandle = BaseDrawer.createHandletype DrawerActions = BaseDrawer.Root.Actions+type DrawerSnapPoint = BaseDrawer.Root.SnapPointtype DrawerChangeEventReason = BaseDrawer.Root.ChangeEventReasontype DrawerChangeEventDetails = BaseDrawer.Root.ChangeEventDetailstype DrawerSnapPointChangeEventReason = BaseDrawer.Root.SnapPointChangeEventReason@@ -32,7 +33,7 @@ type DrawerTriggerProps<Payload = unknown> = BaseDrawer.Trigger.Props<Payload>function DrawerTrigger<Payload = unknown>({ className, ...props }: DrawerTriggerProps<Payload>) {return (<BaseDrawer.Trigger- className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)@@ -150,6 +151,7 @@ export type {DrawerPortalProps,DrawerProps,DrawerProviderProps,+ DrawerSnapPoint,DrawerSnapPointChangeEventDetails,DrawerSnapPointChangeEventReason,DrawerSwipeAreaProps,diff --git a/packages/dify-ui/src/dropdown-menu/index.tsx b/packages/dify-ui/src/dropdown-menu/index.tsxindex ed3a1c8175c..15bd5b8c2f2 100644--- a/packages/dify-ui/src/dropdown-menu/index.tsx+++ b/packages/dify-ui/src/dropdown-menu/index.tsx@@ -2,25 +2,27 @@import type * as React from 'react'import type { InputGroupProps } from '../input-group'-import type { MenuItemVariant } from '../overlay-shared'-import type { Placement } from '../placement'+import type { MenuItemVariant } from '../internal/menu'+import type { Placement } from '../internal/placement'import { Menu } from '@base-ui/react/menu'import { cn } from '../cn'-import { textControlGroupInputClassName } from '../form-control-shared'import { InputGroup } from '../input-group'-import { resolveClassName } from '../internals/resolve-class-name'+import { focusRingClassName } from '../internal/focus'+import { textControlGroupInputClassName } from '../internal/form-control'import {- floatingGroupLabelClassName,- floatingItemIndicatorClassName,- floatingPopupAnimationClassName,- floatingSeparatorClassName,menuItemClassName,menuItemDestructiveClassName,menuPopupBaseClassName,menuPopupSurfaceClassName,- triggerFocusClassName,-} from '../overlay-shared'-import { parsePlacement } from '../placement'+} from '../internal/menu'+import {+ floatingGroupLabelClassName,+ floatingItemIndicatorClassName,+ floatingPopupAnimationClassName,+ floatingSeparatorClassName,+} from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'const DropdownMenu = Menu.Rootconst DropdownMenuPortal = Menu.Portal@@ -50,7 +52,7 @@ function DropdownMenuTrigger<Payload = unknown>({}: DropdownMenuTriggerProps<Payload>) {return (<Menu.Trigger- className={(state) => cn(triggerFocusClassName, resolveClassName(className, state))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)diff --git a/packages/dify-ui/src/field/index.tsx b/packages/dify-ui/src/field/index.tsxindex 69c6d26947a..2bedb529dc5 100644--- a/packages/dify-ui/src/field/index.tsx+++ b/packages/dify-ui/src/field/index.tsx@@ -2,8 +2,8 @@import { Field as BaseField } from '@base-ui/react/field'import { cn } from '../cn'-import { formLabelClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { formLabelClassName } from '../internal/form-control'+import { resolveClassName } from '../internal/resolve-class-name'type FieldActions = BaseField.Root.Actionsdiff --git a/packages/dify-ui/src/fieldset/index.tsx b/packages/dify-ui/src/fieldset/index.tsxindex c981acf81cf..b440968f4cb 100644--- a/packages/dify-ui/src/fieldset/index.tsx+++ b/packages/dify-ui/src/fieldset/index.tsx@@ -2,7 +2,7 @@import { Fieldset as BaseFieldset } from '@base-ui/react/fieldset'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { resolveClassName } from '../internal/resolve-class-name'type FieldsetProps = BaseFieldset.Root.Propsdiff --git a/packages/dify-ui/src/file-tree/index.tsx b/packages/dify-ui/src/file-tree/index.tsxindex eb0e15531db..30e2afee97b 100644--- a/packages/dify-ui/src/file-tree/index.tsx+++ b/packages/dify-ui/src/file-tree/index.tsx@@ -1,11 +1,12 @@'use client'import { Collapsible as BaseCollapsible } from '@base-ui/react/collapsible'-import { mergeProps } from '@base-ui/react/merge-props'-import { useRender } from '@base-ui/react/use-render'import * as React from 'react'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { insetFocusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'+import { mergeProps } from '../merge-props'+import { useRender } from '../use-render'const FileTreeLevelContext = React.createContext(1)@@ -25,8 +26,9 @@ type FileTreeFileState = {function fileTreeRowClassName({ className }: { className?: string }) {return cn(- 'group/file-tree-row relative flex h-6 w-full min-w-0 cursor-pointer items-center rounded-md ps-2 pe-1.5 text-start outline-hidden select-none',- 'hover:bg-state-base-hover focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',+ 'group/file-tree-row relative flex h-6 w-full min-w-0 cursor-pointer items-center rounded-md ps-2 pe-1.5 text-start select-none',+ 'hover:bg-state-base-hover',+ insetFocusRingClassName,'data-selected:bg-state-base-active','data-disabled:cursor-not-allowed data-disabled:opacity-50 data-disabled:hover:bg-transparent',className,@@ -62,9 +64,7 @@ function FileTreeList({ render, className, ...props }: FileTreeListProps) {})}-type FileTreeFolderProps = Omit<BaseCollapsible.Root.Props, 'render'> & {- render?: BaseCollapsible.Root.Props['render']-}+type FileTreeFolderProps = BaseCollapsible.Root.Propsfunction FileTreeFolder({ render = <li />, className, ...props }: FileTreeFolderProps) {return (@@ -103,9 +103,7 @@ function FileTreeFolderTrigger({)}-type FileTreeFolderPanelProps = Omit<BaseCollapsible.Panel.Props, 'render'> & {- render?: BaseCollapsible.Panel.Props['render']-}+type FileTreeFolderPanelProps = BaseCollapsible.Panel.Propsfunction FileTreeFolderPanel({render = <ul />,diff --git a/packages/dify-ui/src/icon-button/index.tsx b/packages/dify-ui/src/icon-button/index.tsxindex 959bab9f2f0..c653573eb95 100644--- a/packages/dify-ui/src/icon-button/index.tsx+++ b/packages/dify-ui/src/icon-button/index.tsx@@ -3,9 +3,119 @@import type { VariantProps } from 'class-variance-authority'import type * as React from 'react'import { Button as BaseButton } from '@base-ui/react/button'+import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import { iconButtonVariants } from './variants'+import { focusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'++const iconButtonVariants = cva(+ [+ focusRingClassName,+ 'inline-flex cursor-pointer items-center justify-center data-disabled:cursor-not-allowed',+ ],+ {+ variants: {+ variant: {+ default: [+ 'text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',+ 'data-disabled:text-text-disabled data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled',+ ],+ primary: [+ 'bg-components-button-primary-bg text-components-button-primary-text shadow-primary-button inset-ring-[0.5px] inset-ring-components-button-primary-border',+ 'hover:bg-components-button-primary-bg-hover hover:shadow-xs hover:shadow-shadow-shadow-3 hover:inset-ring-components-button-primary-border-hover',+ 'data-disabled:bg-components-button-primary-bg-disabled data-disabled:text-components-button-primary-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-primary-border-disabled',+ ],+ secondary: [+ 'bg-components-button-secondary-bg text-components-button-secondary-text shadow-xs inset-ring-[0.5px] shadow-shadow-shadow-3 inset-ring-components-button-secondary-border backdrop-blur-[5px]',+ 'hover:bg-components-button-secondary-bg-hover hover:inset-ring-components-button-secondary-border-hover',+ 'data-disabled:bg-components-button-secondary-bg-disabled data-disabled:text-components-button-secondary-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-secondary-border-disabled data-disabled:backdrop-blur-xs',+ ],+ 'secondary-accent': [+ 'bg-components-button-secondary-bg text-components-button-secondary-accent-text shadow-xs inset-ring-[0.5px] shadow-shadow-shadow-3 inset-ring-components-button-secondary-border backdrop-blur-[5px]',+ 'hover:bg-components-button-secondary-bg-hover hover:inset-ring-components-button-secondary-border-hover',+ 'data-disabled:bg-components-button-secondary-bg-disabled data-disabled:text-components-button-secondary-accent-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-secondary-border-disabled data-disabled:backdrop-blur-xs',+ ],+ tertiary: [+ 'bg-components-button-tertiary-bg text-components-button-tertiary-text',+ 'hover:bg-components-button-tertiary-bg-hover',+ 'data-disabled:bg-components-button-tertiary-bg-disabled data-disabled:text-components-button-tertiary-text-disabled',+ ],+ ghost: [+ 'text-components-button-ghost-text',+ 'hover:bg-components-button-ghost-bg-hover',+ 'data-disabled:text-components-button-ghost-text-disabled',+ ],+ 'ghost-accent': [+ 'text-components-button-secondary-accent-text',+ 'hover:bg-state-accent-hover',+ 'data-disabled:text-components-button-secondary-accent-text-disabled',+ ],+ },+ tone: {+ default: '',+ destructive: '',+ },+ size: {+ xs: 'size-4 rounded-sm p-0',+ sm: 'size-5 rounded-md',+ md: 'size-6 rounded-md p-0.5',+ lg: 'size-8 rounded-lg p-1.5',+ xl: 'size-9 rounded-lg p-2',+ },+ },+ compoundVariants: [+ {+ variant: 'default',+ tone: 'destructive',+ class: [+ 'text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive',+ 'data-disabled:text-text-disabled data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled',+ ],+ },+ {+ variant: 'primary',+ tone: 'destructive',+ class: [+ 'bg-components-button-destructive-primary-bg text-components-button-destructive-primary-text inset-ring-components-button-destructive-primary-border',+ 'hover:bg-components-button-destructive-primary-bg-hover hover:inset-ring-components-button-destructive-primary-border-hover',+ 'data-disabled:bg-components-button-destructive-primary-bg-disabled data-disabled:text-components-button-destructive-primary-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-destructive-primary-bg-disabled',+ ],+ },+ {+ variant: 'secondary',+ tone: 'destructive',+ class: [+ 'bg-components-button-destructive-secondary-bg text-components-button-destructive-secondary-text inset-ring-components-button-destructive-secondary-border',+ 'hover:bg-components-button-destructive-secondary-bg-hover hover:inset-ring-components-button-destructive-secondary-border-hover',+ 'data-disabled:text-components-button-destructive-secondary-text-disabled',+ ],+ },+ {+ variant: 'tertiary',+ tone: 'destructive',+ class: [+ 'bg-components-button-destructive-tertiary-bg text-components-button-destructive-tertiary-text',+ 'hover:bg-components-button-destructive-tertiary-bg-hover',+ 'data-disabled:bg-components-button-destructive-tertiary-bg-disabled data-disabled:text-components-button-destructive-tertiary-text-disabled',+ ],+ },+ {+ variant: 'ghost',+ tone: 'destructive',+ class: [+ 'text-components-button-destructive-ghost-text',+ 'hover:bg-components-button-destructive-ghost-bg-hover',+ 'data-disabled:text-components-button-destructive-ghost-text-disabled',+ ],+ },+ ],+ defaultVariants: {+ variant: 'default',+ tone: 'default',+ size: 'md',+ },+ },+)type AccessibleName =| {diff --git a/packages/dify-ui/src/icon-button/variants.ts b/packages/dify-ui/src/icon-button/variants.tsdeleted file mode 100644index cc68550849c..00000000000--- a/packages/dify-ui/src/icon-button/variants.ts+++ /dev/null@@ -1,111 +0,0 @@-import { cva } from 'class-variance-authority'--const iconButtonVariants = cva(- [- 'inline-flex cursor-pointer items-center justify-center focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-disabled:cursor-not-allowed',- ],- {- variants: {- variant: {- default: [- 'text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',- 'data-disabled:text-text-disabled data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled',- ],- primary: [- 'bg-components-button-primary-bg text-components-button-primary-text shadow-primary-button inset-ring-[0.5px] inset-ring-components-button-primary-border',- 'hover:bg-components-button-primary-bg-hover hover:shadow-xs hover:shadow-shadow-shadow-3 hover:inset-ring-components-button-primary-border-hover',- 'data-disabled:bg-components-button-primary-bg-disabled data-disabled:text-components-button-primary-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-primary-border-disabled',- ],- secondary: [- 'bg-components-button-secondary-bg text-components-button-secondary-text shadow-xs inset-ring-[0.5px] shadow-shadow-shadow-3 inset-ring-components-button-secondary-border backdrop-blur-[5px]',- 'hover:bg-components-button-secondary-bg-hover hover:inset-ring-components-button-secondary-border-hover',- 'data-disabled:bg-components-button-secondary-bg-disabled data-disabled:text-components-button-secondary-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-secondary-border-disabled data-disabled:backdrop-blur-xs',- ],- 'secondary-accent': [- 'bg-components-button-secondary-bg text-components-button-secondary-accent-text shadow-xs inset-ring-[0.5px] shadow-shadow-shadow-3 inset-ring-components-button-secondary-border backdrop-blur-[5px]',- 'hover:bg-components-button-secondary-bg-hover hover:inset-ring-components-button-secondary-border-hover',- 'data-disabled:bg-components-button-secondary-bg-disabled data-disabled:text-components-button-secondary-accent-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-secondary-border-disabled data-disabled:backdrop-blur-xs',- ],- tertiary: [- 'bg-components-button-tertiary-bg text-components-button-tertiary-text',- 'hover:bg-components-button-tertiary-bg-hover',- 'data-disabled:bg-components-button-tertiary-bg-disabled data-disabled:text-components-button-tertiary-text-disabled',- ],- ghost: [- 'text-components-button-ghost-text',- 'hover:bg-components-button-ghost-bg-hover',- 'data-disabled:text-components-button-ghost-text-disabled',- ],- 'ghost-accent': [- 'text-components-button-secondary-accent-text',- 'hover:bg-state-accent-hover',- 'data-disabled:text-components-button-secondary-accent-text-disabled',- ],- },- tone: {- default: '',- destructive: '',- },- size: {- xs: 'size-4 rounded-sm p-0',- sm: 'size-5 rounded-md',- md: 'size-6 rounded-md p-0.5',- lg: 'size-8 rounded-lg p-1.5',- xl: 'size-9 rounded-lg p-2',- },- },- compoundVariants: [- {- variant: 'default',- tone: 'destructive',- class: [- 'text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive',- 'data-disabled:text-text-disabled data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled',- ],- },- {- variant: 'primary',- tone: 'destructive',- class: [- 'bg-components-button-destructive-primary-bg text-components-button-destructive-primary-text inset-ring-components-button-destructive-primary-border',- 'hover:bg-components-button-destructive-primary-bg-hover hover:inset-ring-components-button-destructive-primary-border-hover',- 'data-disabled:bg-components-button-destructive-primary-bg-disabled data-disabled:text-components-button-destructive-primary-text-disabled data-disabled:shadow-none data-disabled:inset-ring-components-button-destructive-primary-bg-disabled',- ],- },- {- variant: 'secondary',- tone: 'destructive',- class: [- 'bg-components-button-destructive-secondary-bg text-components-button-destructive-secondary-text inset-ring-components-button-destructive-secondary-border',- 'hover:bg-components-button-destructive-secondary-bg-hover hover:inset-ring-components-button-destructive-secondary-border-hover',- 'data-disabled:text-components-button-destructive-secondary-text-disabled',- ],- },- {- variant: 'tertiary',- tone: 'destructive',- class: [- 'bg-components-button-destructive-tertiary-bg text-components-button-destructive-tertiary-text',- 'hover:bg-components-button-destructive-tertiary-bg-hover',- 'data-disabled:bg-components-button-destructive-tertiary-bg-disabled data-disabled:text-components-button-destructive-tertiary-text-disabled',- ],- },- {- variant: 'ghost',- tone: 'destructive',- class: [- 'text-components-button-destructive-ghost-text',- 'hover:bg-components-button-destructive-ghost-bg-hover',- 'data-disabled:text-components-button-destructive-ghost-text-disabled',- ],- },- ],- defaultVariants: {- variant: 'default',- tone: 'default',- size: 'md',- },- },-)--export { iconButtonVariants }diff --git a/packages/dify-ui/src/infotip/index.tsx b/packages/dify-ui/src/infotip/index.tsxindex 9991a876b40..04797c3371b 100644--- a/packages/dify-ui/src/infotip/index.tsx+++ b/packages/dify-ui/src/infotip/index.tsx@@ -1,13 +1,13 @@'use client'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { Popover as BasePopover } from '@base-ui/react/popover'import { cn } from '../cn'import { iconButtonVariants } from '../icon-button'-import { resolveClassName } from '../internals/resolve-class-name'-import { hintPopupClassName } from '../overlay-shared'-import { parsePlacement } from '../placement'+import { hintPopupClassName } from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'const iconClassNames = {question: 'i-ri-question-line',diff --git a/packages/dify-ui/src/input-group/index.tsx b/packages/dify-ui/src/input-group/index.tsxindex bc1461c7c95..a6e9276b812 100644--- a/packages/dify-ui/src/input-group/index.tsx+++ b/packages/dify-ui/src/input-group/index.tsx@@ -5,8 +5,8 @@ import type * as React from 'react'import { Input as BaseInput } from '@base-ui/react/input'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { textControlGroupInputClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { textControlGroupInputClassName } from '../internal/form-control'+import { resolveClassName } from '../internal/resolve-class-name'const interactiveElementSelector ='button,a[href],[role="button"],[role="link"],select,[tabindex]:not([tabindex="-1"]),input:not([type="hidden"]):not([disabled]),[contenteditable]:not([contenteditable="false"]),textarea:not([disabled])'@@ -83,10 +83,8 @@ const inputGroupAddonVariants = cva(},)-type InputGroupAddonProps = Omit<React.ComponentPropsWithRef<'div'>, 'className'> &- VariantProps<typeof inputGroupAddonVariants> & {- className?: string- }+type InputGroupAddonProps = React.ComponentProps<'div'> &+ VariantProps<typeof inputGroupAddonVariants>function InputGroupAddon({ align = 'inline-start', className, ...props }: InputGroupAddonProps) {return (diff --git a/packages/dify-ui/src/input/index.tsx b/packages/dify-ui/src/input/index.tsxindex cfd311ec82b..d4d9a7e1d3f 100644--- a/packages/dify-ui/src/input/index.tsx+++ b/packages/dify-ui/src/input/index.tsx@@ -2,8 +2,8 @@import { Input as BaseInput } from '@base-ui/react/input'import { cn } from '../cn'-import { textControlClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { textControlClassName } from '../internal/form-control'+import { resolveClassName } from '../internal/resolve-class-name'type InputProps = Omit<BaseInput.Props, 'size'>type InputChangeEventReason = BaseInput.ChangeEventReasondiff --git a/packages/dify-ui/src/internal/focus.ts b/packages/dify-ui/src/internal/focus.tsnew file mode 100644index 00000000000..19a90ed6df4--- /dev/null+++ b/packages/dify-ui/src/internal/focus.ts@@ -0,0 +1,9 @@+export const focusRingClassName =+ 'focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden'++export const insetFocusRingClassName =+ 'focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid focus-visible:outline-hidden'++// Checked controls need a gap from their accent-colored fill. Set the color at rest so it does not animate in.+export const checkedControlFocusClassName =+ 'outline-state-accent-solid focus-visible:outline-2 focus-visible:outline-offset-2'diff --git a/packages/dify-ui/src/form-control-shared.ts b/packages/dify-ui/src/internal/form-control.tssimilarity index 91%rename from packages/dify-ui/src/form-control-shared.tsrename to packages/dify-ui/src/internal/form-control.tsindex e79cb3c4650..b9eb42a1367 100644--- a/packages/dify-ui/src/form-control-shared.ts+++ b/packages/dify-ui/src/internal/form-control.ts@@ -1,11 +1,6 @@export const formLabelClassName ='w-fit cursor-default py-1 text-text-secondary system-sm-medium data-disabled:cursor-not-allowed'-// The focus indicator of a control whose checked fill is the indicator color (Switch, Checkbox, Radio).-// The gap keeps it distinct from that fill. The color is set at rest so it does not animate in.-export const checkedControlFocusClassName =- 'outline-state-accent-solid focus-visible:outline-2 focus-visible:outline-offset-2'-// The field surface when the native control is the visible field (Input, Textarea).// Focus selects `:focus`, not `data-focused`: a text control shows focus however it was reached, and// Base UI sets `data-focused` only inside a Field. It exposes no read-only attribute on a plain controldiff --git a/packages/dify-ui/src/internal/menu.ts b/packages/dify-ui/src/internal/menu.tsnew file mode 100644index 00000000000..25372ed07cf--- /dev/null+++ b/packages/dify-ui/src/internal/menu.ts@@ -0,0 +1,13 @@+export type MenuItemVariant = 'default' | 'destructive'++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 =+ 'data-[variant=destructive]:text-text-destructive data-[variant=destructive]:data-highlighted:bg-state-destructive-hover'++export const menuPopupBaseClassName =+ 'max-h-(--available-height) overflow-y-auto overflow-x-hidden text-sm text-text-secondary outline-hidden focus:outline-hidden focus-visible:outline-hidden'++export const menuPopupSurfaceClassName =+ 'rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 shadow-lg backdrop-blur-[5px]'diff --git a/packages/dify-ui/src/overlay-shared.ts b/packages/dify-ui/src/internal/overlay.tssimilarity index 59%rename from packages/dify-ui/src/overlay-shared.tsrename to packages/dify-ui/src/internal/overlay.tsindex b06f99f498e..7872913a85d 100644--- a/packages/dify-ui/src/overlay-shared.ts+++ b/packages/dify-ui/src/internal/overlay.ts@@ -1,24 +1,10 @@-export type MenuItemVariant = 'default' | 'destructive'--// The focus indicator a trigger owns. The caller owns the appearance, directly or through `render`.-export const triggerFocusClassName =- 'focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden'--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 =- 'data-[variant=destructive]:text-text-destructive data-[variant=destructive]:data-highlighted:bg-state-destructive-hover'export const floatingItemIndicatorClassName = 'ms-auto flex shrink-0 items-center text-text-accent'// The horizontal inset belongs to the component: it depends on whether the label sits in the// popup (12px) or in a padded list (8px, with the list's padding supplying the rest).export const floatingGroupLabelClassName ='pb-0.5 pt-1 text-text-tertiary system-xs-medium-uppercase'export const floatingSeparatorClassName = 'my-1 h-px bg-divider-subtle'-export const menuPopupBaseClassName =- 'max-h-(--available-height) overflow-y-auto overflow-x-hidden text-sm text-text-secondary outline-hidden focus:outline-hidden focus-visible:outline-hidden'-export const menuPopupSurfaceClassName =- 'rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 shadow-lg backdrop-blur-[5px]'-export const menuPopupClassName = `${menuPopupBaseClassName} ${menuPopupSurfaceClassName}`+export const floatingPopupAnimationClassName ='origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-starting-style:scale-95 data-ending-style:opacity-0 data-starting-style:opacity-0 data-instant:transition-none motion-reduce:transition-none'export const hintPopupClassName =diff --git a/packages/dify-ui/src/placement.ts b/packages/dify-ui/src/internal/placement.tssimilarity index 67%rename from packages/dify-ui/src/placement.tsrename to packages/dify-ui/src/internal/placement.tsindex 561ab8653d3..c3c021adfa0 100644--- a/packages/dify-ui/src/placement.ts+++ b/packages/dify-ui/src/internal/placement.ts@@ -2,29 +2,6 @@// `side-align` notation, with the `center` alignment left off. The inline sides follow the text// direction, so `inline-end` is right in LTR and left in RTL.-type Side = 'top' | 'bottom' | 'left' | 'right' | 'inline-start' | 'inline-end'-type Align = 'start' | 'center' | 'end'--export type Placement =- | 'top'- | 'top-start'- | 'top-end'- | 'right'- | 'right-start'- | 'right-end'- | 'bottom'- | 'bottom-start'- | 'bottom-end'- | 'left'- | 'left-start'- | 'left-end'- | 'inline-start'- | 'inline-start-start'- | 'inline-start-end'- | 'inline-end'- | 'inline-end-start'- | 'inline-end-end'-const PLACEMENT_PARTS = {top: { side: 'top', align: 'center' },'top-start': { side: 'top', align: 'start' },@@ -44,8 +21,10 @@ const PLACEMENT_PARTS = {'inline-end': { side: 'inline-end', align: 'center' },'inline-end-start': { side: 'inline-end', align: 'start' },'inline-end-end': { side: 'inline-end', align: 'end' },-} satisfies Record<Placement, { side: Side; align: Align }>+} as const satisfies Record<string, { side: string; align: string }>++export type Placement = keyof typeof PLACEMENT_PARTS-export function parsePlacement(placement: Placement): { side: Side; align: Align } {+export function parsePlacement(placement: Placement) {return PLACEMENT_PARTS[placement]}diff --git a/packages/dify-ui/src/internals/resolve-class-name.ts b/packages/dify-ui/src/internal/resolve-class-name.tssimilarity index 100%rename from packages/dify-ui/src/internals/resolve-class-name.tsrename to packages/dify-ui/src/internal/resolve-class-name.tsdiff --git a/packages/dify-ui/src/internals/use-iso-layout-effect.ts b/packages/dify-ui/src/internals/use-iso-layout-effect.tsdeleted file mode 100644index b99a0c6ce97..00000000000--- a/packages/dify-ui/src/internals/use-iso-layout-effect.ts+++ /dev/null@@ -1,7 +0,0 @@-'use client'--import * as React from 'react'--const noop: typeof React.useLayoutEffect = () => {}--export const useIsoLayoutEffect = typeof document !== 'undefined' ? React.useLayoutEffect : noopdiff --git a/packages/dify-ui/src/meter/index.tsx b/packages/dify-ui/src/meter/index.tsxindex c1bf0db925f..e18ae05ce9a 100644--- a/packages/dify-ui/src/meter/index.tsx+++ b/packages/dify-ui/src/meter/index.tsx@@ -14,7 +14,7 @@ import type { VariantProps } from 'class-variance-authority'import { Meter as BaseMeter } from '@base-ui/react/meter'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { resolveClassName } from '../internal/resolve-class-name'const Meter = BaseMeter.Roottype MeterProps = BaseMeter.Root.Propsdiff --git a/packages/dify-ui/src/number-field/index.tsx b/packages/dify-ui/src/number-field/index.tsxindex db5093ba91e..ccad4130ef7 100644--- a/packages/dify-ui/src/number-field/index.tsx+++ b/packages/dify-ui/src/number-field/index.tsx@@ -5,8 +5,9 @@ import type * as React from 'react'import { NumberField as BaseNumberField } from '@base-ui/react/number-field'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { textControlGroupClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { insetFocusRingClassName } from '../internal/focus'+import { textControlGroupClassName } from '../internal/form-control'+import { resolveClassName } from '../internal/resolve-class-name'const NumberField = BaseNumberField.Roottype NumberFieldProps = BaseNumberField.Root.Props@@ -113,12 +114,12 @@ function NumberFieldControls({ className, ...props }: NumberFieldControlsProps)const numberFieldControlButtonVariants = cva([- 'flex touch-manipulation items-center justify-center text-text-tertiary outline-hidden transition-colors select-none',+ 'flex touch-manipulation items-center justify-center text-text-tertiary transition-colors select-none','hover:bg-components-input-bg-hover focus-visible:bg-components-input-bg-hover',- 'focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',- 'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:focus-visible:bg-transparent disabled:focus-visible:ring-0',- 'group-data-disabled/number-field:cursor-not-allowed hover:group-data-disabled/number-field:bg-transparent focus-visible:group-data-disabled/number-field:bg-transparent focus-visible:group-data-disabled/number-field:ring-0',- 'group-data-readonly/number-field:cursor-default hover:group-data-readonly/number-field:bg-transparent focus-visible:group-data-readonly/number-field:bg-transparent focus-visible:group-data-readonly/number-field:ring-0',+ insetFocusRingClassName,+ 'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:focus-visible:bg-transparent',+ 'group-data-disabled/number-field:cursor-not-allowed hover:group-data-disabled/number-field:bg-transparent focus-visible:group-data-disabled/number-field:bg-transparent',+ 'group-data-readonly/number-field:cursor-default hover:group-data-readonly/number-field:bg-transparent focus-visible:group-data-readonly/number-field:bg-transparent','motion-reduce:transition-none',],{diff --git a/packages/dify-ui/src/pagination/index.tsx b/packages/dify-ui/src/pagination/index.tsxindex f651674fe67..6f0f7e5d662 100644--- a/packages/dify-ui/src/pagination/index.tsx+++ b/packages/dify-ui/src/pagination/index.tsx@@ -1,15 +1,16 @@'use client'import { Button as BaseButton } from '@base-ui/react/button'-import { mergeProps } from '@base-ui/react/merge-props'-import { useRender } from '@base-ui/react/use-render'-import { useMergedRefs } from '@base-ui/utils/useMergedRefs'+import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect'import * as React from 'react'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import { useIsoLayoutEffect } from '../internals/use-iso-layout-effect'+import { focusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'+import { mergeProps } from '../merge-props'import { NumberField, NumberFieldGroup, NumberFieldInput } from '../number-field'import { SegmentedControl, SegmentedControlItem } from '../segmented-control'+import { useMergedRefs } from '../use-merged-refs'+import { useRender } from '../use-render'type PageItem = number | 'ellipsis-start' | 'ellipsis-end'@@ -218,9 +219,9 @@ type PaginationNextProps = Omit<BaseButton.Props, 'children'> & {}const paginationArrowButtonClassName = [- 'inline-flex size-7 shrink-0 touch-manipulation items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg text-components-button-secondary-text shadow-xs outline-hidden backdrop-blur-[10px] transition-[background-color,border-color,color,box-shadow]',+ 'inline-flex size-7 shrink-0 touch-manipulation items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg text-components-button-secondary-text shadow-xs backdrop-blur-[10px] transition-[background-color,border-color,color,box-shadow]','hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover',- 'focus-visible:ring-2 focus-visible:ring-state-accent-solid',+ focusRingClassName,'disabled:cursor-not-allowed disabled:border-components-button-secondary-border-disabled disabled:bg-components-button-secondary-bg-disabled disabled:text-components-button-secondary-text-disabled disabled:shadow-none','motion-reduce:transition-none',]@@ -390,7 +391,8 @@ function PaginationPageJump({}className={(state) =>cn(- 'inline-flex h-7 touch-manipulation items-center justify-center gap-0.5 rounded-lg px-2 py-1.5 system-xs-medium text-text-secondary tabular-nums outline-hidden transition-colors hover:cursor-text hover:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid motion-reduce:transition-none',+ 'inline-flex h-7 touch-manipulation items-center justify-center gap-0.5 rounded-lg px-2 py-1.5 system-xs-medium text-text-secondary tabular-nums transition-colors hover:cursor-text hover:bg-state-base-hover-alt motion-reduce:transition-none',+ focusRingClassName,resolveClassName(className, state),)}@@ -459,7 +461,8 @@ function PaginationPage({aria-label={ariaLabel ?? (current ? `Page ${page}, current page` : `Go to page ${page}`)}className={(state) =>cn(- 'inline-flex h-8 min-w-8 touch-manipulation items-center justify-center rounded-lg px-1 py-2 system-sm-medium text-text-tertiary tabular-nums outline-hidden hover:bg-components-button-ghost-bg-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid',+ 'inline-flex h-8 min-w-8 touch-manipulation items-center justify-center rounded-lg px-1 py-2 system-sm-medium text-text-tertiary tabular-nums hover:bg-components-button-ghost-bg-hover hover:text-text-secondary',+ focusRingClassName,current &&'bg-components-button-tertiary-bg text-components-button-tertiary-text hover:bg-components-button-ghost-bg-hover',resolveClassName(className, state),diff --git a/packages/dify-ui/src/popover/index.tsx b/packages/dify-ui/src/popover/index.tsxindex 81f4aa70c21..905bd60f6d7 100644--- a/packages/dify-ui/src/popover/index.tsx+++ b/packages/dify-ui/src/popover/index.tsx@@ -1,12 +1,13 @@'use client'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { Popover as BasePopover } from '@base-ui/react/popover'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import { floatingPopupAnimationClassName, triggerFocusClassName } from '../overlay-shared'-import { parsePlacement } from '../placement'+import { focusRingClassName } from '../internal/focus'+import { floatingPopupAnimationClassName } from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'const Popover = BasePopover.Rootconst PopoverArrow = BasePopover.Arrow@@ -31,7 +32,7 @@ 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))}+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}{...props}/>)diff --git a/packages/dify-ui/src/preview-card/index.tsx b/packages/dify-ui/src/preview-card/index.tsxindex 85cadd098b8..04c7d5df57c 100644--- a/packages/dify-ui/src/preview-card/index.tsx+++ b/packages/dify-ui/src/preview-card/index.tsx@@ -1,12 +1,12 @@'use client'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { PreviewCard as BasePreviewCard } from '@base-ui/react/preview-card'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import { floatingPopupAnimationClassName } from '../overlay-shared'-import { parsePlacement } from '../placement'+import { floatingPopupAnimationClassName } from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'/*** PreviewCard follows Base UI's canonical semantics: a hover/focus-triggereddiff --git a/packages/dify-ui/src/progress/index.tsx b/packages/dify-ui/src/progress/index.tsxindex fcf9f105f8f..41395f46543 100644--- a/packages/dify-ui/src/progress/index.tsx+++ b/packages/dify-ui/src/progress/index.tsx@@ -4,7 +4,7 @@ import type { VariantProps } from 'class-variance-authority'import { Progress as BaseProgress } from '@base-ui/react/progress'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { resolveClassName } from '../internal/resolve-class-name'const progressCircleRootVariants = cva('inline-flex shrink-0 items-center justify-center', {variants: {diff --git a/packages/dify-ui/src/radio-group/__tests__/index.spec.tsx b/packages/dify-ui/src/radio-group/__tests__/index.spec.tsxindex d3b06fde06b..13e2f18b5e0 100644--- a/packages/dify-ui/src/radio-group/__tests__/index.spec.tsx+++ b/packages/dify-ui/src/radio-group/__tests__/index.spec.tsx@@ -1,4 +1,4 @@-import type { RadioGroupProps } from '../index'+import type { RadioGroupProps, RadioProps } from '../index'import * as React from 'react'import { render } from 'vitest-browser-react'import { Field, FieldItem, FieldLabel } from '../../field'@@ -27,7 +27,7 @@ function TestRadioGroup<Value = string>({)}-type TestRadioOptionProps = React.ComponentProps<typeof Radio> & {+type TestRadioOptionProps = RadioProps & {children: React.ReactNode}diff --git a/packages/dify-ui/src/radio-group/index.tsx b/packages/dify-ui/src/radio-group/index.tsxindex f9142e502f2..cd26e181f71 100644--- a/packages/dify-ui/src/radio-group/index.tsx+++ b/packages/dify-ui/src/radio-group/index.tsx@@ -4,8 +4,8 @@ import type * as React from 'react'import { Radio as BaseRadio } from '@base-ui/react/radio'import { RadioGroup as BaseRadioGroup } from '@base-ui/react/radio-group'import { cn } from '../cn'-import { checkedControlFocusClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { checkedControlFocusClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'type RadioGroupProps<Value = string> = BaseRadioGroup.Props<Value>type RadioGroupChangeEventReason = BaseRadioGroup.ChangeEventReasondiff --git a/packages/dify-ui/src/scroll-area/index.tsx b/packages/dify-ui/src/scroll-area/index.tsxindex 7a6d9e27102..a4e37b05d44 100644--- a/packages/dify-ui/src/scroll-area/index.tsx+++ b/packages/dify-ui/src/scroll-area/index.tsx@@ -2,7 +2,7 @@import { ScrollArea as BaseScrollArea } from '@base-ui/react/scroll-area'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { resolveClassName } from '../internal/resolve-class-name'type ScrollAreaProps = BaseScrollArea.Root.Propsdiff --git a/packages/dify-ui/src/segmented-control/index.tsx b/packages/dify-ui/src/segmented-control/index.tsxindex 8be49b90b4a..3c250a7d6cb 100644--- a/packages/dify-ui/src/segmented-control/index.tsx+++ b/packages/dify-ui/src/segmented-control/index.tsx@@ -4,7 +4,8 @@ import type * as React from 'react'import { Radio as BaseRadio } from '@base-ui/react/radio'import { RadioGroup as BaseRadioGroup } from '@base-ui/react/radio-group'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { focusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'type SegmentedControlSelectionProps<Value> =| {@@ -50,7 +51,8 @@ function SegmentedControlItem<Value = string>({render={render}className={(state) =>cn(- 'relative flex h-7 min-w-0 touch-manipulation items-center justify-center gap-0.5 overflow-hidden rounded-lg border-[0.5px] border-transparent px-2 py-1 system-sm-medium whitespace-nowrap text-text-secondary hover:bg-state-base-hover hover:text-text-secondary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-checked:border-components-segmented-control-item-active-border data-checked:bg-components-segmented-control-item-active-bg data-checked:text-text-accent-light-mode-only data-checked:shadow-xs data-checked:shadow-shadow-shadow-3 data-disabled:cursor-not-allowed data-disabled:bg-transparent data-disabled:text-text-disabled data-disabled:shadow-none data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled',+ focusRingClassName,+ 'relative flex h-7 min-w-0 touch-manipulation items-center justify-center gap-0.5 overflow-hidden rounded-lg border-[0.5px] border-transparent px-2 py-1 system-sm-medium whitespace-nowrap text-text-secondary hover:bg-state-base-hover hover:text-text-secondary data-checked:border-components-segmented-control-item-active-border data-checked:bg-components-segmented-control-item-active-bg data-checked:text-text-accent-light-mode-only data-checked:shadow-xs data-checked:shadow-shadow-shadow-3 data-disabled:cursor-not-allowed data-disabled:bg-transparent data-disabled:text-text-disabled data-disabled:shadow-none data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled',resolveClassName(className, state),)}@@ -59,9 +61,7 @@ function SegmentedControlItem<Value = string>({)}-type SegmentedControlDividerProps = Omit<React.ComponentProps<'span'>, 'className'> & {- className?: string-}+type SegmentedControlDividerProps = React.ComponentProps<'span'>function SegmentedControlDivider({ className, ...props }: SegmentedControlDividerProps) {return (diff --git a/packages/dify-ui/src/select/index.tsx b/packages/dify-ui/src/select/index.tsxindex 43f9a47f9c9..8e36b965d65 100644--- a/packages/dify-ui/src/select/index.tsx+++ b/packages/dify-ui/src/select/index.tsx@@ -3,19 +3,20 @@import type { ComponentRenderFn, HTMLProps } from '@base-ui/react/types'import type { VariantProps } from 'class-variance-authority'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { Select as BaseSelect } from '@base-ui/react/select'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { formLabelClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { focusRingClassName } from '../internal/focus'+import { formLabelClassName } from '../internal/form-control'import {floatingGroupLabelClassName,floatingItemIndicatorClassName,floatingPopupAnimationClassName,floatingSeparatorClassName,-} from '../overlay-shared'-import { parsePlacement } from '../placement'+} from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'type SelectActions = BaseSelect.Root.Actionstype SelectChangeEventReason = BaseSelect.Root.ChangeEventReason@@ -68,9 +69,9 @@ type SelectGroupProps = BaseSelect.Group.Propsconst selectTriggerVariants = cva([- 'group/select-trigger flex w-full items-center border-0 bg-components-input-bg-normal text-start text-components-input-text-filled outline-hidden',+ 'group/select-trigger flex w-full items-center border-0 bg-components-input-bg-normal text-start text-components-input-text-filled','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',+ focusRingClassName,'data-invalid:not-data-disabled:bg-components-input-bg-destructive data-invalid:not-data-disabled:inset-ring-1 data-invalid:not-data-disabled:inset-ring-components-input-border-destructive','data-placeholder:text-components-input-text-placeholder','data-readonly:not-data-disabled:cursor-default data-readonly:not-data-disabled:not-data-invalid:bg-components-input-bg-normal data-readonly:not-data-disabled:not-data-invalid:hover:bg-components-input-bg-normal',diff --git a/packages/dify-ui/src/separator/index.tsx b/packages/dify-ui/src/separator/index.tsxindex b3863f8d88c..0e28338d4f2 100644--- a/packages/dify-ui/src/separator/index.tsx+++ b/packages/dify-ui/src/separator/index.tsx@@ -3,7 +3,7 @@import { Separator as BaseSeparator } from '@base-ui/react/separator'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { resolveClassName } from '../internal/resolve-class-name'const separatorVariants = cva('shrink-0', {variants: {diff --git a/packages/dify-ui/src/slider/index.tsx b/packages/dify-ui/src/slider/index.tsxindex bef3af03fbc..3ed60625ad1 100644--- a/packages/dify-ui/src/slider/index.tsx+++ b/packages/dify-ui/src/slider/index.tsx@@ -2,8 +2,8 @@import { Slider as BaseSlider } from '@base-ui/react/slider'import { cn } from '../cn'-import { formLabelClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { formLabelClassName } from '../internal/form-control'+import { resolveClassName } from '../internal/resolve-class-name'type SliderRootValue = NonNullable<BaseSlider.Root.Props['value']>type SliderProps<Value extends SliderRootValue = SliderRootValue> = BaseSlider.Root.Props<Value>diff --git a/packages/dify-ui/src/switch/index.stories.tsx b/packages/dify-ui/src/switch/index.stories.tsxindex f22f3537548..ca118d4c6a7 100644--- a/packages/dify-ui/src/switch/index.stories.tsx+++ b/packages/dify-ui/src/switch/index.stories.tsx@@ -1,4 +1,5 @@import type { Meta, StoryObj } from '@storybook/react-vite'+import type { SwitchProps } from '.'import * as React from 'react'import { expect } from 'storybook/test'import { Switch, SwitchSkeleton } from '.'@@ -46,7 +47,7 @@ export default metatype Story = StoryObj<typeof meta>type SwitchDemoProps = Partial<- Omit<React.ComponentProps<typeof Switch>, 'checked' | 'defaultChecked' | 'onCheckedChange'>+ Omit<SwitchProps, 'checked' | 'defaultChecked' | 'onCheckedChange'>> & {checked?: boolean}diff --git a/packages/dify-ui/src/switch/index.tsx b/packages/dify-ui/src/switch/index.tsxindex 17218ae91c0..3577819c859 100644--- a/packages/dify-ui/src/switch/index.tsx+++ b/packages/dify-ui/src/switch/index.tsx@@ -5,8 +5,8 @@ import type * as React from 'react'import { Switch as BaseSwitch } from '@base-ui/react/switch'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { checkedControlFocusClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { checkedControlFocusClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'const switchRootVariants = cva([diff --git a/packages/dify-ui/src/tabs/index.tsx b/packages/dify-ui/src/tabs/index.tsxindex ed95cc8feb8..74aeeb08e55 100644--- a/packages/dify-ui/src/tabs/index.tsx+++ b/packages/dify-ui/src/tabs/index.tsx@@ -2,7 +2,8 @@import { Tabs as BaseTabs } from '@base-ui/react/tabs'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'+import { focusRingClassName, insetFocusRingClassName } from '../internal/focus'+import { resolveClassName } from '../internal/resolve-class-name'type TabsProps = BaseTabs.Root.Propstype TabsChangeEventReason = BaseTabs.Root.ChangeEventReason@@ -27,7 +28,8 @@ function TabsTab({ className, ...props }: TabsTabProps) {<BaseTabs.TabclassName={(state) =>cn(- 'relative flex cursor-pointer touch-manipulation items-center border-b-2 border-transparent pt-2.5 pb-2 system-md-semibold text-text-tertiary focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden data-active:border-components-tab-active data-active:text-text-primary data-disabled:cursor-not-allowed data-disabled:text-text-tertiary data-disabled:opacity-30 data-active:data-disabled:text-text-primary',+ focusRingClassName,+ 'relative flex cursor-pointer touch-manipulation items-center border-b-2 border-transparent pt-2.5 pb-2 system-md-semibold text-text-tertiary data-active:border-components-tab-active data-active:text-text-primary data-disabled:cursor-not-allowed data-disabled:text-text-tertiary data-disabled:opacity-30 data-active:data-disabled:text-text-primary',resolveClassName(className, state),)}@@ -41,12 +43,7 @@ type TabsPanelProps = BaseTabs.Panel.Propsfunction TabsPanel({ className, ...props }: TabsPanelProps) {return (<BaseTabs.Panel- className={(state) =>- cn(- 'outline-hidden focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid',- resolveClassName(className, state),- )- }+ className={(state) => cn(insetFocusRingClassName, resolveClassName(className, state))}{...props}/>)diff --git a/packages/dify-ui/src/textarea/index.tsx b/packages/dify-ui/src/textarea/index.tsxindex b4b3b2704dc..eb1d28a5fa5 100644--- a/packages/dify-ui/src/textarea/index.tsx+++ b/packages/dify-ui/src/textarea/index.tsx@@ -5,8 +5,8 @@ import type * as React from 'react'import { Field as BaseField } from '@base-ui/react/field'import { cva } from 'class-variance-authority'import { cn } from '../cn'-import { textControlClassName } from '../form-control-shared'-import { resolveClassName } from '../internals/resolve-class-name'+import { textControlClassName } from '../internal/form-control'+import { resolveClassName } from '../internal/resolve-class-name'const textareaVariants = cva([textControlClassName, 'min-h-20 overflow-auto'], {variants: {@@ -37,7 +37,7 @@ type UncontrolledTextareaProps = {onValueChange?: TextareaOnValueChange}-type TextareaNativeProps = React.ComponentPropsWithRef<'textarea'>+type TextareaNativeProps = React.ComponentProps<'textarea'>type TextareaOnlyProps = Pick<TextareaNativeProps, 'cols' | 'rows' | 'wrap'>type TextareaElementProps = Omit<TextareaNativeProps,diff --git a/packages/dify-ui/src/toast/index.tsx b/packages/dify-ui/src/toast/index.tsxindex ae740328321..ac02dd26f67 100644--- a/packages/dify-ui/src/toast/index.tsx+++ b/packages/dify-ui/src/toast/index.tsx@@ -9,7 +9,8 @@ import type {import type * as React from 'react'import { Toast as BaseToast } from '@base-ui/react/toast'import { cn } from '../cn'-import { iconButtonVariants } from '../icon-button/variants'+import { iconButtonVariants } from '../icon-button'+import { focusRingClassName } from '../internal/focus'type ToastData = Record<string, never>// `loading` is reserved for `promise`, which resolves it into `success` or `error`.@@ -149,7 +150,8 @@ function ToastCard({ toast: toastItem, children }: ToastCardProps) {toast={toastItem}swipeDirection={['up', 'right']}className={cn(- 'group/toast pointer-events-auto absolute top-0 right-0 w-full origin-top cursor-default rounded-xl select-none focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden',+ focusRingClassName,+ 'group/toast pointer-events-auto absolute top-0 right-0 w-full origin-top cursor-default rounded-xl select-none','[--toast-current-height:var(--toast-frontmost-height,var(--toast-height))] [--toast-expanded-offset-y:calc(var(--toast-offset-y)+var(--toast-swipe-movement-y)+(var(--toast-index)*var(--toast-gap)))] [--toast-gap:8px] [--toast-peek:5px] [--toast-scale:calc(1-(var(--toast-index)*0.0225))] [--toast-shrink:calc(1-var(--toast-scale))]','z-[calc(100-var(--toast-index))] h-(--toast-current-height)','[transition:transform_500ms_cubic-bezier(0.22,1,0.36,1),opacity_500ms,height_150ms] motion-reduce:transition-none',@@ -195,7 +197,8 @@ function ToastCard({ toast: toastItem, children }: ToastCardProps) {<BaseToast.ActionclassName={cn('mt-2 mb-1 flex w-fit items-center justify-center overflow-hidden rounded-md border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg px-3 py-2 system-sm-medium text-components-button-secondary-text shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]',- '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',+ focusRingClassName,+ 'hover:bg-state-base-hover focus-visible:bg-state-base-hover',)}/></div>diff --git a/packages/dify-ui/src/tooltip/index.tsx b/packages/dify-ui/src/tooltip/index.tsxindex 3f2d97537ec..32e6325e8cc 100644--- a/packages/dify-ui/src/tooltip/index.tsx+++ b/packages/dify-ui/src/tooltip/index.tsx@@ -1,12 +1,12 @@'use client'import type * as React from 'react'-import type { Placement } from '../placement'+import type { Placement } from '../internal/placement'import { Tooltip as BaseTooltip } from '@base-ui/react/tooltip'import { cn } from '../cn'-import { resolveClassName } from '../internals/resolve-class-name'-import { hintPopupClassName } from '../overlay-shared'-import { parsePlacement } from '../placement'+import { hintPopupClassName } from '../internal/overlay'+import { parsePlacement } from '../internal/placement'+import { resolveClassName } from '../internal/resolve-class-name'const TooltipProvider = BaseTooltip.Providerconst Tooltip = BaseTooltip.Rootdiff --git a/web/app/components/base/date-time-picker/use-picker-labels.ts b/web/app/components/base/date-time-picker/use-picker-labels.tsindex 09c3e08151a..f891e96b1f1 100644--- a/web/app/components/base/date-time-picker/use-picker-labels.ts+++ b/web/app/components/base/date-time-picker/use-picker-labels.ts@@ -1,6 +1,6 @@'use client'-import type { DirectionProviderProps } from '@langgenius/dify-ui/direction-provider'+import type { TextDirection } from '@langgenius/dify-ui/direction-provider'import { useTranslation } from 'react-i18next'import { useLocale } from '#i18n'@@ -11,8 +11,7 @@ export function usePickerLabels() {new Intl.DateTimeFormat(locale, { hour: 'numeric', hour12: true, timeZone: 'UTC' }).formatToParts(new Date(Date.UTC(2025, 0, 1, hour))).find((part) => part.type === 'dayPeriod')?.value ?? (hour < 12 ? 'AM' : 'PM')- const direction: DirectionProviderProps['direction'] =- locale === 'ar-TN' || locale === 'fa-IR' ? 'rtl' : 'ltr'+ const direction: TextDirection = locale === 'ar-TN' || locale === 'fa-IR' ? 'rtl' : 'ltr'return {direction,locale,diff --git a/web/app/components/base/float-right-container/index.tsx b/web/app/components/base/float-right-container/index.tsxindex 5a8ac99f5aa..214f5632be8 100644--- a/web/app/components/base/float-right-container/index.tsx+++ b/web/app/components/base/float-right-container/index.tsx@@ -1,5 +1,5 @@'use client'-import type { ComponentProps } from 'react'+import type { DrawerPopupProps } from '@langgenius/dify-ui/drawer'import { cn } from '@langgenius/dify-ui/cn'import {Drawer,@@ -14,7 +14,7 @@ import {import { IconButton } from '@langgenius/dify-ui/icon-button'import { useTranslation } from 'react-i18next'-type IFloatRightContainerProps = {+type IFloatRightContainerProps = Pick<DrawerPopupProps, 'finalFocus'> & {isMobile: booleanisOpen: booleanonClose: () => void@@ -23,7 +23,6 @@ type IFloatRightContainerProps = {panelClassName?: stringtitle?: stringmask?: boolean- finalFocus?: ComponentProps<typeof DrawerPopup>['finalFocus']}const FloatRightContainer = ({diff --git a/web/app/components/datasets/hit-testing/components/chunk-detail-dialog.tsx b/web/app/components/datasets/hit-testing/components/chunk-detail-dialog.tsxindex ea26284cc93..2a60f9eeb58 100644--- a/web/app/components/datasets/hit-testing/components/chunk-detail-dialog.tsx+++ b/web/app/components/datasets/hit-testing/components/chunk-detail-dialog.tsx@@ -1,5 +1,5 @@'use client'-import type { DialogChangeEventDetails } from '@langgenius/dify-ui/dialog'+import type { DialogProps } from '@langgenius/dify-ui/dialog'import type { FileAppearanceTypeEnum } from '@/app/components/base/file-uploader/types'import type { HitTesting } from '@/models/datasets'import { cn } from '@langgenius/dify-ui/cn'@@ -28,10 +28,8 @@ import { Score } from './score'const i18nPrefix = ''-type ChunkDetailDialogProps = {+type ChunkDetailDialogProps = Required<Pick<DialogProps, 'open' | 'onOpenChange'>> & {payload: HitTesting- open: boolean- onOpenChange: (open: boolean, eventDetails: DialogChangeEventDetails) => void}export function ChunkDetailDialog({ payload, open, onOpenChange }: ChunkDetailDialogProps) {diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsxindex cb408a43478..d5f171fc51a 100644--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx@@ -327,7 +327,7 @@ function Popup({<ModelSelectorPreviewCardcapabilitiesLabel={t(($) => $['model.capabilities'], { ns: 'common' })}language={language}- payload={payload as ModelSelectorPreviewPayload | undefined}+ payload={payload}/>)}</PreviewCard>diff --git a/web/app/components/plugins/plugin-auth/authorized-in-node.tsx b/web/app/components/plugins/plugin-auth/authorized-in-node.tsxindex 3630e86a1c1..924c5785f51 100644--- a/web/app/components/plugins/plugin-auth/authorized-in-node.tsx+++ b/web/app/components/plugins/plugin-auth/authorized-in-node.tsx@@ -132,7 +132,7 @@ const AuthorizedInNode = ({renderTrigger={renderTrigger}isOpen={isOpen}onOpenChange={setIsOpen}- offset={4}+ sideOffset={4}placement="bottom-end"triggerPopupSameWidth={false}popupClassName="w-[360px]"diff --git a/web/app/components/plugins/plugin-auth/authorized/index.tsx b/web/app/components/plugins/plugin-auth/authorized/index.tsxindex 2d0f63a1343..ed6e5fde821 100644--- a/web/app/components/plugins/plugin-auth/authorized/index.tsx+++ b/web/app/components/plugins/plugin-auth/authorized/index.tsx@@ -1,4 +1,3 @@-import type { OffsetOptions } from '@floating-ui/react'import type { PopoverContentProps } from '@langgenius/dify-ui/popover'import type { Credential, PluginPayload } from '../types'import {@@ -27,7 +26,7 @@ import {import { CredentialTypeEnum } from '../types'import Item from './item'-type AuthorizedProps = Pick<PopoverContentProps, 'placement'> & {+type AuthorizedProps = Pick<PopoverContentProps, 'placement' | 'sideOffset'> & {pluginPayload: PluginPayloadcredentials: Credential[]canOAuth?: boolean@@ -35,7 +34,6 @@ type AuthorizedProps = Pick<PopoverContentProps, 'placement'> & {renderTrigger?: (open?: boolean) => React.ReactNodeisOpen?: booleanonOpenChange?: (open: boolean) => void- offset?: number | OffsetOptionstriggerPopupSameWidth?: booleanpopupClassName?: stringdisableSetDefault?: boolean@@ -54,7 +52,7 @@ const Authorized = ({renderTrigger,isOpen,onOpenChange,- offset = 8,+ sideOffset = 8,placement = 'bottom-start',triggerPopupSameWidth = true,popupClassName,@@ -191,13 +189,6 @@ const Authorized = ({const unavailableCredential = credentials.find((credential) => credential.not_allowed_to_use && credential.is_default,)- const resolvedOffset =- typeof offset === 'number' || typeof offset === 'function' ? undefined : offset- const sideOffset = typeof offset === 'number' ? offset : (resolvedOffset?.mainAxis ?? 0)- const alignOffset =- typeof offset === 'number'- ? 0- : (resolvedOffset?.crossAxis ?? resolvedOffset?.alignmentAxis ?? 0)return (<>@@ -231,7 +222,6 @@ const Authorized = ({<PopoverContentplacement={placement}sideOffset={sideOffset}- alignOffset={alignOffset}className={cn('border-0 bg-transparent p-0 shadow-none backdrop-blur-none',triggerPopupSameWidth && 'w-(--anchor-width)',diff --git a/web/app/components/plugins/update-plugin/plugin-version-picker.tsx b/web/app/components/plugins/update-plugin/plugin-version-picker.tsxindex 624356bed3c..bb3a03a6e7e 100644--- a/web/app/components/plugins/update-plugin/plugin-version-picker.tsx+++ b/web/app/components/plugins/update-plugin/plugin-version-picker.tsx@@ -1,4 +1,5 @@'use client'+import type { PopoverContentProps } from '@langgenius/dify-ui/popover'import type { FC } from 'react'import { cn } from '@langgenius/dify-ui/cn'import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'@@ -10,26 +11,26 @@ import useTimestamp from '@/hooks/use-timestamp'import { useVersionListOfPlugin } from '@/service/use-plugins'import { isEarlierThanVersion } from '@/utils/semver'-type Props = Readonly<{- disabled?: boolean- isShow: boolean- onShowChange: (isShow: boolean) => void- pluginID: string- currentVersion: string- trigger: (open: boolean) => React.ReactNode- triggerAccessibleName?: string- sideOffset?: number- alignOffset?: number- onSelect: ({- version,- unique_identifier,- isDowngrade,- }: {- version: string- unique_identifier: string- isDowngrade: boolean- }) => void-}>+type Props = Readonly<+ Pick<PopoverContentProps, 'sideOffset' | 'alignOffset'> & {+ disabled?: boolean+ isShow: boolean+ onShowChange: (isShow: boolean) => void+ pluginID: string+ currentVersion: string+ trigger: (open: boolean) => React.ReactNode+ triggerAccessibleName?: string+ onSelect: ({+ version,+ unique_identifier,+ isDowngrade,+ }: {+ version: string+ unique_identifier: string+ isDowngrade: boolean+ }) => void+ }+>const PluginVersionPicker: FC<Props> = ({disabled = false,diff --git a/web/app/components/workflow/operator/add-block.tsx b/web/app/components/workflow/operator/add-block.tsxindex d6c0efba7ec..dc9246a266a 100644--- a/web/app/components/workflow/operator/add-block.tsx+++ b/web/app/components/workflow/operator/add-block.tsx@@ -19,13 +19,12 @@ import {getNodesWithSameDefaultDataType,} from '../utils'-type AddBlockProps = {+type AddBlockProps = Pick<+ BlockSelectorProps,+ 'triggerClassName' | 'sideOffset' | 'alignOffset' | 'isolateKeyboardEvents'+> & {renderTrigger?: BlockSelectorProps['trigger']- triggerClassName?: BlockSelectorProps['triggerClassName']- sideOffset?: BlockSelectorProps['sideOffset']- alignOffset?: BlockSelectorProps['alignOffset']onClose?: () => void- isolateKeyboardEvents?: boolean}const AddBlock = ({renderTrigger,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.tsxindex 81cc8fd3d91..d1f7e60b719 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@@ -109,7 +109,7 @@ function UnauthorizedCredentialStatus({renderTrigger={renderTrigger}isOpen={isOpen}onOpenChange={setIsOpen}- offset={4}+ sideOffset={4}placement="bottom-end"triggerPopupSameWidth={false}popupClassName="w-[360px]"