Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(ui): align Menu APIs and expose ContextMenu anatomy (#44747)

yyhaa89fd817322
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8543394b789..850799b7bf6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -310,7 +310,7 @@
# Frontend - Personal Settings
/web/app/components/header/account-setting/ @CodingOnStar @iamjoel
-/web/app/components/header/account-dropdown/ @CodingOnStar @iamjoel
+/web/app/components/header/account-menu/ @CodingOnStar @iamjoel
# Frontend - Analytics
/web/app/components/base/ga/ @CodingOnStar @iamjoel
@@ -331,7 +331,7 @@
/web/app/education/ @iamjoel @zxhlyh
# Frontend - Workspace
-/web/app/components/header/account-dropdown/workplace-selector/ @iamjoel @zxhlyh
+/web/app/components/header/account-menu/workplace-selector/ @iamjoel @zxhlyh
# Frontend - App Shell and Console Bootstrap
/web/app/layout.tsx @iamjoel @lyzno1
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 061e2abddc7..df0d9803e20 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -3061,12 +3061,12 @@
"count": 2
}
},
- "web/app/components/header/account-dropdown/compliance.tsx": {
+ "web/app/components/header/account-menu/compliance.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 3
}
},
- "web/app/components/header/account-dropdown/workplace-selector/index.tsx": {
+ "web/app/components/header/account-menu/workplace-selector/index.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 2
}
@@ -3357,7 +3357,7 @@
"count": 1
}
},
- "web/app/components/plugins/marketplace/sort-dropdown/index.tsx": {
+ "web/app/components/plugins/marketplace/sort-menu/index.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 2
}
@@ -3594,7 +3594,7 @@
"count": 4
}
},
- "web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx": {
+ "web/app/components/plugins/plugin-page/install-plugin-menu.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 1
}
@@ -6748,9 +6748,9 @@
"count": 5
}
},
- "web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx": {
+ "web/features/agent-v2/roster/components/agent-workflow-references-menu.tsx": {
"better-tailwindcss/enforce-logical-properties": {
- "count": 3
+ "count": 1
}
},
"web/features/agent-v2/template-preview/grid-background.tsx": {
@@ -6833,7 +6833,7 @@
"count": 1
}
},
- "web/features/new-rag/documents/actions-dropdown.tsx": {
+ "web/features/new-rag/documents/actions-menu.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 1
}
@@ -7567,4 +7567,4 @@
"count": 2
}
}
-}
\ No newline at end of file
+}
diff --git a/packages/dify-ui/README.md b/packages/dify-ui/README.md
index 223aecf4061..c261d398d06 100644
--- a/packages/dify-ui/README.md
+++ b/packages/dify-ui/README.md
@@ -44,7 +44,7 @@ Import `styles.css` once from the consumer's root stylesheet or entrypoint.
| Layout | `./scroll-area`, `./separator` |
| Media | `./avatar` |
| Navigation | `./breadcrumb`, `./file-tree`, `./pagination`, `./tabs` |
-| Overlay and menu | `./alert-dialog`, `./context-menu`, `./dialog`, `./drawer`, `./dropdown-menu`, `./infotip`, `./popover`, `./preview-card`, `./tooltip` |
+| Overlay and menu | `./alert-dialog`, `./context-menu`, `./dialog`, `./drawer`, `./menu`, `./infotip`, `./popover`, `./preview-card`, `./tooltip` |
| Search and pick | `./autocomplete`, `./combobox`, `./select`, `./date-picker`, `./time-picker`, `./date-time-picker` |
Utilities:
diff --git a/packages/dify-ui/docs/overlays.md b/packages/dify-ui/docs/overlays.md
index 27ed53fae59..3a43756d56f 100644
--- a/packages/dify-ui/docs/overlays.md
+++ b/packages/dify-ui/docs/overlays.md
@@ -76,9 +76,11 @@ clipped, `display: none` or unmounted, and the shared positioner class turns tha
`onOpenChange` when the answer must be explicit. `AlertDialogHeader` holds the title and
description; anything the user fills in or reviews before answering goes in `AlertDialogBody`.
- Use `Drawer` for side-panel interactions that follow the drawer model.
-- Use `DropdownMenu` for button-triggered action lists and `ContextMenu` for context actions.
- A long action list filters with `DropdownMenuFilterProvider`; choosing a value is
+- Use `Menu` for button-triggered action lists and `ContextMenu` for context actions.
+ A long action list filters with `MenuFilterProvider`; choosing a value is
[`Combobox`] in [Selection].
+ Use `ContextMenuPortal`, `ContextMenuPositioner`, and `ContextMenuPopup` for custom portal
+ containers or positioning beyond `ContextMenuContent`'s common options.
- Use [`Tooltip`] for a supplementary visual label on a control that already has a primary
action and an accessible name. Use `Infotip` when the information icon's action is to open
the explanation. Text length alone does not determine the component. Follow the
diff --git a/packages/dify-ui/docs/styling.md b/packages/dify-ui/docs/styling.md
index a29542b424d..56419e4133c 100644
--- a/packages/dify-ui/docs/styling.md
+++ b/packages/dify-ui/docs/styling.md
@@ -98,14 +98,14 @@ outline handling at their call sites. A package-wide interaction contract can ha
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 that
-opens a surface (Popover, DropdownMenu, Collapsible, Combobox, Dialog, AlertDialog, Drawer); they
+opens a surface (Popover, Menu, Collapsible, Combobox, Dialog, AlertDialog, Drawer); they
share one ring. Rows inside a composite defer to its highlight. Parts that only attach behavior
(Tooltip, PreviewCard, and ContextMenu triggers, and Close parts) add no styles.
Text controls (Input, Textarea, InputGroup, NumberField, and the Combobox and Autocomplete input
groups) draw that ring on the visible field. It replaces the hover border, and an invalid field
keeps its border and fill inside it. Switch, Checkbox, and Radio leave a gap between the control and
-the indicator, because their checked fill is the indicator color. `DropdownMenuInputGroup` is the
+the indicator, because their checked fill is the indicator color. `MenuInputGroup` is the
exception: Base UI marks `Menu.Input` with `data-highlighted` while the input holds the keyboard
highlight, so the group draws the ring on that state and drops it once the arrow keys move the
highlight into the list.
diff --git a/packages/dify-ui/package.json b/packages/dify-ui/package.json
index 624f70f0644..2d6cebf25e2 100644
--- a/packages/dify-ui/package.json
+++ b/packages/dify-ui/package.json
@@ -89,9 +89,9 @@
"types": "./src/drawer/index.tsx",
"import": "./src/drawer/index.tsx"
},
- "./dropdown-menu": {
- "types": "./src/dropdown-menu/index.tsx",
- "import": "./src/dropdown-menu/index.tsx"
+ "./menu": {
+ "types": "./src/menu/index.tsx",
+ "import": "./src/menu/index.tsx"
},
"./field": {
"types": "./src/field/index.tsx",
diff --git a/packages/dify-ui/src/avatar/index.stories.tsx b/packages/dify-ui/src/avatar/index.stories.tsx
index 7c208b89f54..37c6bf9c466 100644
--- a/packages/dify-ui/src/avatar/index.stories.tsx
+++ b/packages/dify-ui/src/avatar/index.stories.tsx
@@ -1,13 +1,8 @@
import type { Meta, StoryObj } from '@storybook/react-vite'
import { expect, waitFor, within } from 'storybook/test'
import { Avatar, AvatarFallback, AvatarGroup, AvatarGroupCount, AvatarImage } from '.'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuLinkItem,
- DropdownMenuTrigger,
-} from '../dropdown-menu'
import { IconButton } from '../icon-button'
+import { Menu, MenuContent, MenuLinkItem, MenuTrigger } from '../menu'
const avatarUrl = 'https://i.pravatar.cc/96?u=avatar-default'
@@ -216,14 +211,14 @@ export const Collaborators: Story = {
docs: {
description: {
story:
- 'A Design Kit collaborator control: 24px avatars inside a rounded panel button with a 12px chevron. Compose the trigger with IconButton through render to retain button styling and cursor behavior. This capsule supplies its own dimensions instead of an IconButton square size. DropdownMenu owns keyboard navigation, expanded state, and focus restoration; the avatars inside its named trigger are decorative. The example links represent collaborator profiles.',
+ 'A Design Kit collaborator control: 24px avatars inside a rounded panel button with a 12px chevron. Compose the trigger with IconButton through render to retain button styling and cursor behavior. This capsule supplies its own dimensions instead of an IconButton square size. Menu owns keyboard navigation, expanded state, and focus restoration; the avatars inside its named trigger are decorative. The example links represent collaborator profiles.',
},
},
},
render: () => (
<div className="flex min-h-32 items-center justify-center rounded-xl bg-background-section p-8">
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label="View 4 collaborators"
@@ -249,17 +244,17 @@ export const Collaborators: Story = {
</IconButton>
}
/>
- <DropdownMenuContent>
+ <MenuContent>
{collaborators.map((person) => (
- <DropdownMenuLinkItem key={person.name} href={person.href}>
+ <MenuLinkItem key={person.name} href={person.href}>
<Avatar size="sm" aria-hidden="true">
<AvatarFallback className={person.color}>{person.initial}</AvatarFallback>
</Avatar>
{person.name}
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
),
play: async ({ canvas, canvasElement, userEvent }) => {
diff --git a/packages/dify-ui/src/breadcrumb/index.stories.tsx b/packages/dify-ui/src/breadcrumb/index.stories.tsx
index 8178731b4b6..2b2fe13fcf7 100644
--- a/packages/dify-ui/src/breadcrumb/index.stories.tsx
+++ b/packages/dify-ui/src/breadcrumb/index.stories.tsx
@@ -9,13 +9,8 @@ import {
BreadcrumbPage,
BreadcrumbSeparator,
} from '.'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '../dropdown-menu'
import { IconButton } from '../icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '../menu'
const meta = {
title: 'Base/UI/Breadcrumb',
@@ -226,7 +221,7 @@ export const CollapsedAncestors: Story = {
docs: {
description: {
story:
- 'Collapsing is an explicit DropdownMenu composition. Its trigger owns the accessible name; hidden ancestors remain links. Escape restores focus to the trigger.',
+ 'Collapsing is an explicit Menu composition. Its trigger owns the accessible name; hidden ancestors remain links. Escape restores focus to the trigger.',
},
},
},
@@ -238,19 +233,19 @@ export const CollapsedAncestors: Story = {
</BreadcrumbItem>
<BreadcrumbSeparator />
<BreadcrumbItem>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton aria-label="Show ancestor pages">
<span aria-hidden className="i-ri-more-line size-4" />
</IconButton>
}
/>
- <DropdownMenuContent>
- <DropdownMenuItem render={<a href="#projects" />}>Projects</DropdownMenuItem>
- <DropdownMenuItem render={<a href="#knowledge" />}>Knowledge</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuItem render={<a href="#projects" />}>Projects</MenuItem>
+ <MenuItem render={<a href="#knowledge" />}>Knowledge</MenuItem>
+ </MenuContent>
+ </Menu>
</BreadcrumbItem>
<BreadcrumbSeparator />
<BreadcrumbItem>
diff --git a/packages/dify-ui/src/combobox/index.tsx b/packages/dify-ui/src/combobox/index.tsx
index 5fd7d056679..24b4ae15a8c 100644
--- a/packages/dify-ui/src/combobox/index.tsx
+++ b/packages/dify-ui/src/combobox/index.tsx
@@ -113,7 +113,7 @@ function ComboboxTrigger({ className, type = 'button', ...props }: ComboboxTrigg
}
// The group owns the horizontal padding and the gap, so an icon, the input, and the controls sit in
-// it without margins of their own, like `DropdownMenuInputGroup`. The input keeps a narrow inset so
+// it without margins of their own, like `MenuInputGroup`. The input keeps a narrow inset so
// its text lands where a standalone `Input` of the same size puts it.
const comboboxInputGroupVariants = cva(
[
@@ -217,7 +217,7 @@ const comboboxControlVariants = cva(
type ComboboxClearProps = BaseCombobox.Clear.Props & VariantProps<typeof comboboxControlVariants>
-// Same look as `DropdownMenuClear`; change both together.
+// Same look as `MenuClear`; change both together.
function ComboboxClear({
className,
children,
@@ -409,7 +409,7 @@ function ComboboxSeparator({ className, ...props }: ComboboxSeparatorProps) {
type ComboboxEmptyProps = BaseCombobox.Empty.Props
-// Same look as `DropdownMenuEmpty`; change both together.
+// Same look as `MenuEmpty`; change both together.
function ComboboxEmpty({ className, ...props }: ComboboxEmptyProps) {
return (
<BaseCombobox.Empty
diff --git a/packages/dify-ui/src/context-menu/__tests__/index.spec.tsx b/packages/dify-ui/src/context-menu/__tests__/index.spec.tsx
index 070167a6e8c..22b9afaa566 100644
--- a/packages/dify-ui/src/context-menu/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/context-menu/__tests__/index.spec.tsx
@@ -7,9 +7,8 @@ import {
ContextMenuItem,
ContextMenuLinkItem,
ContextMenuSeparator,
- ContextMenuSub,
- ContextMenuSubContent,
- ContextMenuSubTrigger,
+ ContextMenuSubmenu,
+ ContextMenuSubmenuTrigger,
ContextMenuTrigger,
} from '../index'
@@ -47,7 +46,7 @@ describe('context-menu wrapper', () => {
.toBeCloseTo(triggerRect.left + 8, 0)
await expect
.poll(() => screen.getByRole('menu').element().getBoundingClientRect().top)
- .toBeCloseTo(triggerRect.top + 8, 0)
+ .toBeCloseTo(triggerRect.top + 8 + 4, 0)
await expect
.element(screen.getByRole('menuitem', { name: 'Content action' }))
@@ -93,18 +92,18 @@ describe('context-menu wrapper', () => {
})
})
- describe('ContextMenuSubContent', () => {
+ describe('ContextMenuContent inside a submenu', () => {
it('should place sub-content inline-end-start when side and align are omitted', async () => {
const screen = await renderWithRoomAround(
<ContextMenu>
<ContextMenuTrigger aria-label="context trigger">Open</ContextMenuTrigger>
<ContextMenuContent>
- <ContextMenuSub open>
- <ContextMenuSubTrigger>More actions</ContextMenuSubTrigger>
- <ContextMenuSubContent>
+ <ContextMenuSubmenu open>
+ <ContextMenuSubmenuTrigger>More actions</ContextMenuSubmenuTrigger>
+ <ContextMenuContent>
<ContextMenuItem>Sub action</ContextMenuItem>
- </ContextMenuSubContent>
- </ContextMenuSub>
+ </ContextMenuContent>
+ </ContextMenuSubmenu>
</ContextMenuContent>
</ContextMenu>,
)
@@ -172,16 +171,16 @@ describe('context-menu wrapper', () => {
<ContextMenu>
<ContextMenuTrigger aria-label="context trigger">Open</ContextMenuTrigger>
<ContextMenuContent>
- <ContextMenuSub open>
- <ContextMenuSubTrigger
+ <ContextMenuSubmenu open>
+ <ContextMenuSubmenuTrigger
variant={variant}
aria-label="submenu action"
id={`context-sub-${variant}`}
onClick={handleClick}
>
Trigger item
- </ContextMenuSubTrigger>
- </ContextMenuSub>
+ </ContextMenuSubmenuTrigger>
+ </ContextMenuSubmenu>
</ContextMenuContent>
</ContextMenu>,
)
@@ -304,12 +303,12 @@ it('resolves submenu popup classes with the popup state', async () => {
<ContextMenu>
<ContextMenuTrigger>Open audit menu</ContextMenuTrigger>
<ContextMenuContent>
- <ContextMenuSub open>
- <ContextMenuSubTrigger>More audit actions</ContextMenuSubTrigger>
- <ContextMenuSubContent className={(state) => (state.open ? 'opacity-50' : 'opacity-100')}>
+ <ContextMenuSubmenu open>
+ <ContextMenuSubmenuTrigger>More audit actions</ContextMenuSubmenuTrigger>
+ <ContextMenuContent className={(state) => (state.open ? 'opacity-50' : 'opacity-100')}>
<ContextMenuItem>Audit action</ContextMenuItem>
- </ContextMenuSubContent>
- </ContextMenuSub>
+ </ContextMenuContent>
+ </ContextMenuSubmenu>
</ContextMenuContent>
</ContextMenu>,
)
diff --git a/packages/dify-ui/src/context-menu/__tests__/types.tsx b/packages/dify-ui/src/context-menu/__tests__/types.tsx
new file mode 100644
index 00000000000..55ca7a4d484
--- /dev/null
+++ b/packages/dify-ui/src/context-menu/__tests__/types.tsx
@@ -0,0 +1,49 @@
+import type { ContextMenu as BaseContextMenu } from '@base-ui/react/context-menu'
+import type {
+ ContextMenuPopupProps,
+ ContextMenuPortalProps,
+ ContextMenuPositionerProps,
+} from '@langgenius/dify-ui/context-menu'
+import {
+ ContextMenuPopup,
+ ContextMenuPortal,
+ ContextMenuPositioner,
+} from '@langgenius/dify-ui/context-menu'
+import * as React from 'react'
+import { expectTypeOf } from 'vite-plus/test'
+
+export function contextMenuAnatomyTypeContracts() {
+ expectTypeOf<ContextMenuPortalProps>().toEqualTypeOf<BaseContextMenu.Portal.Props>()
+ expectTypeOf<ContextMenuPositionerProps>().toEqualTypeOf<BaseContextMenu.Positioner.Props>()
+ expectTypeOf<ContextMenuPopupProps>().toEqualTypeOf<BaseContextMenu.Popup.Props>()
+
+ const container = React.createRef<HTMLDivElement>()
+ const portal = React.createRef<HTMLDivElement>()
+ const positioner = React.createRef<HTMLDivElement>()
+ const popup = React.createRef<HTMLDivElement>()
+
+ return (
+ <ContextMenuPortal container={container} ref={portal} keepMounted>
+ <ContextMenuPositioner
+ ref={positioner}
+ anchor={container}
+ collisionAvoidance={{ side: 'flip', align: 'shift' }}
+ className={(state) => {
+ expectTypeOf(state).toEqualTypeOf<BaseContextMenu.Positioner.State>()
+ return state.anchorHidden ? 'invisible' : ''
+ }}
+ style={(state) => ({ opacity: state.anchorHidden ? 0 : 1 })}
+ >
+ <ContextMenuPopup
+ ref={popup}
+ finalFocus={container}
+ className={(state) => {
+ expectTypeOf(state).toEqualTypeOf<BaseContextMenu.Popup.State>()
+ return state.open ? 'opacity-100' : 'opacity-0'
+ }}
+ style={(state) => ({ opacity: state.open ? 1 : 0 })}
+ />
+ </ContextMenuPositioner>
+ </ContextMenuPortal>
+ )
+}
diff --git a/packages/dify-ui/src/context-menu/index.stories.tsx b/packages/dify-ui/src/context-menu/index.stories.tsx
index 7c9b4f08bdc..6937760b80b 100644
--- a/packages/dify-ui/src/context-menu/index.stories.tsx
+++ b/packages/dify-ui/src/context-menu/index.stories.tsx
@@ -1,5 +1,6 @@
import type { Meta, StoryObj } from '@storybook/react-vite'
import * as React from 'react'
+import { expect, userEvent, waitFor, within } from 'storybook/test'
import {
ContextMenu,
ContextMenuCheckboxItem,
@@ -9,13 +10,15 @@ import {
ContextMenuGroupLabel,
ContextMenuItem,
ContextMenuLinkItem,
+ ContextMenuPopup,
+ ContextMenuPortal,
+ ContextMenuPositioner,
ContextMenuRadioGroup,
ContextMenuRadioItem,
ContextMenuRadioItemIndicator,
ContextMenuSeparator,
- ContextMenuSub,
- ContextMenuSubContent,
- ContextMenuSubTrigger,
+ ContextMenuSubmenu,
+ ContextMenuSubmenuTrigger,
ContextMenuTrigger,
} from '.'
@@ -69,14 +72,14 @@ export const WithSubmenu: Story = {
<ContextMenuItem>Copy</ContextMenuItem>
<ContextMenuItem>Paste</ContextMenuItem>
<ContextMenuSeparator />
- <ContextMenuSub>
- <ContextMenuSubTrigger>Share</ContextMenuSubTrigger>
- <ContextMenuSubContent className="w-36">
+ <ContextMenuSubmenu>
+ <ContextMenuSubmenuTrigger>Share</ContextMenuSubmenuTrigger>
+ <ContextMenuContent className="w-36">
<ContextMenuItem>Email</ContextMenuItem>
<ContextMenuItem>Slack</ContextMenuItem>
<ContextMenuItem>Copy link</ContextMenuItem>
- </ContextMenuSubContent>
- </ContextMenuSub>
+ </ContextMenuContent>
+ </ContextMenuSubmenu>
</ContextMenuContent>
</ContextMenu>
),
@@ -207,17 +210,17 @@ export const Complex: Story = {
Duplicate
</ContextMenuItem>
<ContextMenuSeparator />
- <ContextMenuSub>
- <ContextMenuSubTrigger>
+ <ContextMenuSubmenu>
+ <ContextMenuSubmenuTrigger>
<span aria-hidden className="i-ri-share-line size-4 shrink-0 text-text-tertiary" />
Share
- </ContextMenuSubTrigger>
- <ContextMenuSubContent className="w-36">
+ </ContextMenuSubmenuTrigger>
+ <ContextMenuContent className="w-36">
<ContextMenuItem>Email</ContextMenuItem>
<ContextMenuItem>Slack</ContextMenuItem>
<ContextMenuItem>Copy Link</ContextMenuItem>
- </ContextMenuSubContent>
- </ContextMenuSub>
+ </ContextMenuContent>
+ </ContextMenuSubmenu>
<ContextMenuSeparator />
<ContextMenuItem variant="destructive">
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
@@ -227,3 +230,70 @@ export const Complex: Story = {
</ContextMenu>
),
}
+
+function ExplicitAnatomyDemo() {
+ const containerRef = React.useRef<HTMLDivElement>(null)
+ const anchorRef = React.useRef<HTMLDivElement>(null)
+ const [action, setAction] = React.useState('No action selected')
+
+ return (
+ <div>
+ <ContextMenu>
+ <ContextMenuTrigger
+ ref={anchorRef}
+ tabIndex={0}
+ className="rounded-xl border border-divider-subtle p-6"
+ >
+ Right-click for anchored actions
+ </ContextMenuTrigger>
+ <ContextMenuPortal container={containerRef}>
+ <ContextMenuPositioner anchor={anchorRef} side="bottom" align="start" sideOffset={8}>
+ <ContextMenuPopup
+ aria-label="Anchored actions"
+ className="min-w-40 scroll-py-1 rounded-lg border border-divider-subtle bg-background-default py-1 shadow-md"
+ >
+ <ContextMenuSubmenu>
+ <ContextMenuSubmenuTrigger>Share</ContextMenuSubmenuTrigger>
+ <ContextMenuContent>
+ <ContextMenuItem onClick={() => setAction('Link copied')}>
+ Copy link
+ </ContextMenuItem>
+ </ContextMenuContent>
+ </ContextMenuSubmenu>
+ </ContextMenuPopup>
+ </ContextMenuPositioner>
+ </ContextMenuPortal>
+ </ContextMenu>
+ <div ref={containerRef} role="region" aria-label="Menu portal" />
+ <p role="status">{action}</p>
+ </div>
+ )
+}
+
+export const ExplicitAnatomy: Story = {
+ render: () => <ExplicitAnatomyDemo />,
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement)
+ const body = within(canvasElement.ownerDocument.body)
+ const trigger = canvas.getByText('Right-click for anchored actions')
+ trigger.focus()
+ await userEvent.pointer({ target: trigger, keys: '[MouseRight]' })
+ const popup = await within(canvas.getByRole('region', { name: 'Menu portal' })).findByRole(
+ 'menu',
+ { name: 'Anchored actions' },
+ )
+ await waitFor(() =>
+ expect(popup.getBoundingClientRect().top).toBeGreaterThanOrEqual(
+ trigger.getBoundingClientRect().bottom + 7,
+ ),
+ )
+ await userEvent.keyboard('{ArrowDown}')
+ await waitFor(() => expect(body.getByRole('menuitem', { name: 'Share' })).toHaveFocus())
+ await userEvent.keyboard('{ArrowRight}')
+ await waitFor(() => expect(body.getByRole('menuitem', { name: 'Copy link' })).toHaveFocus())
+ await userEvent.keyboard('{Enter}')
+ await waitFor(() => expect(canvas.getByRole('status')).toHaveTextContent('Link copied'))
+ await waitFor(() => expect(body.queryByRole('menu')).not.toBeInTheDocument())
+ await expect(trigger).toHaveFocus()
+ },
+}
diff --git a/packages/dify-ui/src/context-menu/index.tsx b/packages/dify-ui/src/context-menu/index.tsx
index f47666fb3eb..53661c5fe29 100644
--- a/packages/dify-ui/src/context-menu/index.tsx
+++ b/packages/dify-ui/src/context-menu/index.tsx
@@ -20,17 +20,18 @@ import {
import { resolveClassName } from '../internal/resolve-class-name'
const ContextMenu = BaseContextMenu.Root
+const ContextMenuPortal = BaseContextMenu.Portal
const ContextMenuTrigger = BaseContextMenu.Trigger
-const ContextMenuSub = BaseContextMenu.SubmenuRoot
+const ContextMenuSubmenu = BaseContextMenu.SubmenuRoot
const ContextMenuGroup = BaseContextMenu.Group
type ContextMenuProps = BaseContextMenu.Root.Props
type ContextMenuActions = BaseContextMenu.Root.Actions
type ContextMenuChangeEventReason = BaseContextMenu.Root.ChangeEventReason
type ContextMenuChangeEventDetails = BaseContextMenu.Root.ChangeEventDetails
type ContextMenuTriggerProps = BaseContextMenu.Trigger.Props
-type ContextMenuSubProps = BaseContextMenu.SubmenuRoot.Props
-type ContextMenuSubChangeEventReason = BaseContextMenu.SubmenuRoot.ChangeEventReason
-type ContextMenuSubChangeEventDetails = BaseContextMenu.SubmenuRoot.ChangeEventDetails
+type ContextMenuSubmenuProps = BaseContextMenu.SubmenuRoot.Props
+type ContextMenuSubmenuChangeEventReason = BaseContextMenu.SubmenuRoot.ChangeEventReason
+type ContextMenuSubmenuChangeEventDetails = BaseContextMenu.SubmenuRoot.ChangeEventDetails
type ContextMenuGroupProps = BaseContextMenu.Group.Props
type ContextMenuRadioGroupChangeEventReason = BaseContextMenu.RadioGroup.ChangeEventReason
type ContextMenuRadioGroupChangeEventDetails = BaseContextMenu.RadioGroup.ChangeEventDetails
@@ -51,8 +52,36 @@ function ContextMenuRadioGroup<Value = unknown>(
return <BaseContextMenu.RadioGroup {...props} />
}
-type ContextMenuContentProps = Omit<BaseContextMenu.Popup.Props, 'children'> &
- Pick<BaseContextMenu.Positioner.Props, 'side' | 'align' | 'sideOffset' | 'alignOffset'> & {
+type ContextMenuPortalProps = BaseContextMenu.Portal.Props
+type ContextMenuPositionerProps = BaseContextMenu.Positioner.Props
+type ContextMenuPopupProps = BaseContextMenu.Popup.Props
+
+function ContextMenuPositioner({ className, ...props }: ContextMenuPositionerProps) {
+ return (
+ <BaseContextMenu.Positioner
+ className={(state) => cn(positionerClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
+
+function ContextMenuPopup({ className, ...props }: ContextMenuPopupProps) {
+ return (
+ <BaseContextMenu.Popup
+ className={(state) =>
+ cn(
+ menuPopupBaseClassName,
+ floatingPopupAnimationClassName,
+ resolveClassName(className, state),
+ )
+ }
+ {...props}
+ />
+ )
+}
+
+type ContextMenuContentProps = Omit<ContextMenuPopupProps, 'children'> &
+ Pick<ContextMenuPositionerProps, 'side' | 'align' | 'sideOffset' | 'alignOffset'> & {
children: React.ReactNode
}
@@ -60,35 +89,27 @@ function ContextMenuContent({
children,
side,
align,
- sideOffset = 0,
+ sideOffset = 4,
alignOffset = 0,
className,
...props
}: ContextMenuContentProps) {
return (
- <BaseContextMenu.Portal>
- <BaseContextMenu.Positioner
+ <ContextMenuPortal>
+ <ContextMenuPositioner
side={side}
align={align}
sideOffset={sideOffset}
alignOffset={alignOffset}
- className={positionerClassName}
>
- <BaseContextMenu.Popup
- className={(state) =>
- cn(
- menuPopupBaseClassName,
- menuPopupSurfaceClassName,
- floatingPopupAnimationClassName,
- resolveClassName(className, state),
- )
- }
+ <ContextMenuPopup
+ className={(state) => cn(menuPopupSurfaceClassName, resolveClassName(className, state))}
{...props}
>
{children}
- </BaseContextMenu.Popup>
- </BaseContextMenu.Positioner>
- </BaseContextMenu.Portal>
+ </ContextMenuPopup>
+ </ContextMenuPositioner>
+ </ContextMenuPortal>
)
}
@@ -194,16 +215,16 @@ function ContextMenuRadioItemIndicator({
type ContextMenuRadioItemIndicatorProps = Omit<BaseContextMenu.RadioItemIndicator.Props, 'children'>
-type ContextMenuSubTriggerProps = BaseContextMenu.SubmenuTrigger.Props & {
+type ContextMenuSubmenuTriggerProps = BaseContextMenu.SubmenuTrigger.Props & {
variant?: ContextMenuItemVariant
}
-function ContextMenuSubTrigger({
+function ContextMenuSubmenuTrigger({
className,
variant = 'default',
children,
...props
-}: ContextMenuSubTriggerProps) {
+}: ContextMenuSubmenuTriggerProps) {
return (
<BaseContextMenu.SubmenuTrigger
data-variant={variant}
@@ -221,44 +242,6 @@ function ContextMenuSubTrigger({
)
}
-type ContextMenuSubContentProps = ContextMenuContentProps
-
-function ContextMenuSubContent({
- children,
- side,
- align,
- sideOffset = 4,
- alignOffset,
- className,
- ...props
-}: ContextMenuSubContentProps) {
- return (
- <BaseContextMenu.Portal>
- <BaseContextMenu.Positioner
- side={side}
- align={align}
- sideOffset={sideOffset}
- alignOffset={alignOffset}
- className={positionerClassName}
- >
- <BaseContextMenu.Popup
- className={(state) =>
- cn(
- menuPopupBaseClassName,
- menuPopupSurfaceClassName,
- floatingPopupAnimationClassName,
- resolveClassName(className, state),
- )
- }
- {...props}
- >
- {children}
- </BaseContextMenu.Popup>
- </BaseContextMenu.Positioner>
- </BaseContextMenu.Portal>
- )
-}
-
type ContextMenuGroupLabelProps = BaseContextMenu.GroupLabel.Props
function ContextMenuGroupLabel({ className, ...props }: ContextMenuGroupLabelProps) {
@@ -292,13 +275,15 @@ export {
ContextMenuGroupLabel,
ContextMenuItem,
ContextMenuLinkItem,
+ ContextMenuPopup,
+ ContextMenuPortal,
+ ContextMenuPositioner,
ContextMenuRadioGroup,
ContextMenuRadioItem,
ContextMenuRadioItemIndicator,
ContextMenuSeparator,
- ContextMenuSub,
- ContextMenuSubContent,
- ContextMenuSubTrigger,
+ ContextMenuSubmenu,
+ ContextMenuSubmenuTrigger,
ContextMenuTrigger,
}
@@ -315,6 +300,9 @@ export type {
ContextMenuGroupProps,
ContextMenuItemProps,
ContextMenuLinkItemProps,
+ ContextMenuPopupProps,
+ ContextMenuPortalProps,
+ ContextMenuPositionerProps,
ContextMenuProps,
ContextMenuRadioGroupChangeEventDetails,
ContextMenuRadioGroupChangeEventReason,
@@ -322,10 +310,9 @@ export type {
ContextMenuRadioItemIndicatorProps,
ContextMenuRadioItemProps,
ContextMenuSeparatorProps,
- ContextMenuSubChangeEventDetails,
- ContextMenuSubChangeEventReason,
- ContextMenuSubContentProps,
- ContextMenuSubProps,
- ContextMenuSubTriggerProps,
+ ContextMenuSubmenuChangeEventDetails,
+ ContextMenuSubmenuChangeEventReason,
+ ContextMenuSubmenuProps,
+ ContextMenuSubmenuTriggerProps,
ContextMenuTriggerProps,
}
diff --git a/packages/dify-ui/src/drawer/index.stories.tsx b/packages/dify-ui/src/drawer/index.stories.tsx
index 821e65dcec9..39f8ad89074 100644
--- a/packages/dify-ui/src/drawer/index.stories.tsx
+++ b/packages/dify-ui/src/drawer/index.stories.tsx
@@ -724,7 +724,7 @@ const mobileComponentLinks = [
{ href: '/storybook/mobile/components/collapsible', label: 'Collapsible' },
{ href: '/storybook/mobile/components/dialog', label: 'Dialog' },
{ href: '/storybook/mobile/components/drawer', label: 'Drawer' },
- { href: '/storybook/mobile/components/dropdown-menu', label: 'Dropdown Menu' },
+ { href: '/storybook/mobile/components/menu', label: 'Menu' },
{ href: '/storybook/mobile/components/file-tree', label: 'File Tree' },
{ href: '/storybook/mobile/components/pagination', label: 'Pagination' },
{ href: '/storybook/mobile/components/popover', label: 'Popover' },
diff --git a/packages/dify-ui/src/dropdown-menu/__tests__/types.tsx b/packages/dify-ui/src/dropdown-menu/__tests__/types.tsx
deleted file mode 100644
index e7c5693b98f..00000000000
--- a/packages/dify-ui/src/dropdown-menu/__tests__/types.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { Menu } from '@base-ui/react/menu'
-import type {
- DropdownMenuActions,
- DropdownMenuContentProps,
- DropdownMenuHandle,
- DropdownMenuProps,
- DropdownMenuSubContentProps,
-} from '@langgenius/dify-ui/dropdown-menu'
-import {
- createDropdownMenuHandle,
- DropdownMenu,
- DropdownMenuSubContent,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
-import * as React from 'react'
-import { expectTypeOf } from 'vite-plus/test'
-
-type Payload = { documentId: string }
-
-export function dropdownMenuTypeContracts() {
- const handle = createDropdownMenuHandle<Payload>()
- expectTypeOf(handle).toEqualTypeOf<DropdownMenuHandle<Payload>>()
- const trigger = (
- <DropdownMenuTrigger handle={handle} payload={{ documentId: 'document-1' }}>
- Actions
- </DropdownMenuTrigger>
- )
- const menu = (
- <DropdownMenu handle={handle}>
- {({ payload }) => {
- expectTypeOf(payload).toEqualTypeOf<Payload | undefined>()
- return <span>{payload?.documentId}</span>
- }}
- </DropdownMenu>
- )
- const invalid = (
- // @ts-expect-error Detached triggers preserve the handle payload contract.
- <DropdownMenuTrigger handle={handle} payload={{ documentId: 1 }}>
- Actions
- </DropdownMenuTrigger>
- )
- return { trigger, menu, invalid }
-}
-
-export function dropdownMenuActionsTypeContract() {
- const actionsRef = React.createRef<DropdownMenuActions>()
- expectTypeOf(actionsRef.current).toEqualTypeOf<
- NonNullable<DropdownMenuProps['actionsRef']>['current']
- >()
- return <DropdownMenu actionsRef={actionsRef} />
-}
-
-export function dropdownMenuPositioningTypeContracts() {
- type Positioning = 'side' | 'align' | 'sideOffset' | 'alignOffset'
- expectTypeOf<Pick<DropdownMenuContentProps, Positioning>>().toEqualTypeOf<
- Pick<Menu.Positioner.Props, Positioning>
- >()
- expectTypeOf<Pick<DropdownMenuSubContentProps, Positioning>>().toEqualTypeOf<
- Pick<Menu.Positioner.Props, Positioning>
- >()
- const inherited = <DropdownMenuSubContent>Actions</DropdownMenuSubContent>
- const independent = <DropdownMenuSubContent align="end">Actions</DropdownMenuSubContent>
- const invalidSide = (
- // @ts-expect-error Combined placement strings are not valid sides.
- <DropdownMenuSubContent side="inline-end-start">Actions</DropdownMenuSubContent>
- )
- // @ts-expect-error Logical sides are not alignments.
- const invalidAlign = <DropdownMenuSubContent align="inline-end">Actions</DropdownMenuSubContent>
- return { inherited, independent, invalidSide, invalidAlign }
-}
diff --git a/packages/dify-ui/src/dropdown-menu/index.tsx b/packages/dify-ui/src/dropdown-menu/index.tsx
deleted file mode 100644
index 218b251ed35..00000000000
--- a/packages/dify-ui/src/dropdown-menu/index.tsx
+++ /dev/null
@@ -1,494 +0,0 @@
-'use client'
-
-import type * as React from 'react'
-import type { InputGroupProps } from '../input-group'
-import type { MenuItemVariant } from '../internal/menu'
-import { Menu } from '@base-ui/react/menu'
-import { cn } from '../cn'
-import { InputGroup } from '../input-group'
-import { focusRingClassName } from '../internal/focus'
-import { textControlGroupInputClassName } from '../internal/form-control'
-import {
- menuItemClassName,
- menuItemDestructiveClassName,
- menuPopupBaseClassName,
- menuPopupSurfaceClassName,
-} from '../internal/menu'
-import {
- floatingGroupLabelClassName,
- floatingItemIndicatorClassName,
- floatingPopupAnimationClassName,
- floatingSeparatorClassName,
- positionerClassName,
-} from '../internal/overlay'
-import { resolveClassName } from '../internal/resolve-class-name'
-
-const DropdownMenu = Menu.Root
-const DropdownMenuPortal = Menu.Portal
-const DropdownMenuSub = Menu.SubmenuRoot
-const DropdownMenuGroup = Menu.Group
-const createDropdownMenuHandle = Menu.createHandle
-
-// A filterable menu hosts its input in `DropdownMenuInputGroup` and its items in `DropdownMenuList`,
-// so the list owns the `menu` role and the scrolling while the popup keeps its padding.
-const DropdownMenuFilterProvider = Menu.FilterProvider
-const useDropdownMenuFilter = Menu.useFilter
-
-type DropdownMenuHandle<Payload = unknown> = Menu.Handle<Payload>
-
-type DropdownMenuActions = Menu.Root.Actions
-type DropdownMenuChangeEventReason = Menu.Root.ChangeEventReason
-type DropdownMenuChangeEventDetails = Menu.Root.ChangeEventDetails
-type DropdownMenuHighlightEventReason = Menu.Root.HighlightEventReason
-type DropdownMenuHighlightEventDetails = Menu.Root.HighlightEventDetails
-
-type DropdownMenuProps<Payload = unknown> = Menu.Root.Props<Payload>
-type DropdownMenuTriggerProps<Payload = unknown> = Menu.Trigger.Props<Payload>
-
-function DropdownMenuTrigger<Payload = unknown>({
- className,
- ...props
-}: DropdownMenuTriggerProps<Payload>) {
- return (
- <Menu.Trigger
- className={(state) => cn(focusRingClassName, resolveClassName(className, state))}
- {...props}
- />
- )
-}
-type DropdownMenuPortalProps = Menu.Portal.Props
-type DropdownMenuSubProps = Menu.SubmenuRoot.Props
-type DropdownMenuSubChangeEventReason = Menu.SubmenuRoot.ChangeEventReason
-type DropdownMenuSubChangeEventDetails = Menu.SubmenuRoot.ChangeEventDetails
-type DropdownMenuGroupProps = Menu.Group.Props
-type DropdownMenuFilterProviderProps = Menu.FilterProvider.Props
-type DropdownMenuFilterProviderChangeEventReason = Menu.FilterProvider.ChangeEventReason
-type DropdownMenuFilterProviderChangeEventDetails = Menu.FilterProvider.ChangeEventDetails
-
-type DropdownMenuInputGroupProps = InputGroupProps
-
-// A dify-ui composition over `InputGroup` with the menu's input and clear parts; it carries no Base
-// UI state attributes. Laid out like the Combobox popup search, with a minimum width because the
-// input has no intrinsic width and a menu popup is sized by its items. `InputGroup` owns the focus
-// ring; this group withholds it while the focused input lacks Base UI's `data-highlighted`, so the
-// ring shows while the input holds the keyboard highlight and gives way to the item highlight once
-// the arrow keys move into the list.
-function DropdownMenuInputGroup({ className, ...props }: DropdownMenuInputGroupProps) {
- return (
- <InputGroup
- className={cn(
- 'mx-1 mb-1 w-auto min-w-48 gap-0.5 px-2 has-[>input:focus:not([data-highlighted])]:ring-0',
- className,
- )}
- {...props}
- />
- )
-}
-
-type DropdownMenuInputProps = Menu.Input.Props
-
-// The group's padding and icon surround the input, so it keeps only a narrow inset.
-function DropdownMenuInput({ className, ...props }: DropdownMenuInputProps) {
- return (
- <Menu.Input
- className={(state) =>
- cn(textControlGroupInputClassName, 'px-1', resolveClassName(className, state))
- }
- {...props}
- />
- )
-}
-
-type DropdownMenuClearProps = Menu.Clear.Props
-
-// Base UI shows it only while the input has a value and keeps it out of the accessibility tree and
-// the tab order. Same look as `ComboboxClear`; change both together.
-function DropdownMenuClear({ className, children, ...props }: DropdownMenuClearProps) {
- return (
- <Menu.Clear
- className={(state) =>
- cn(
- 'flex size-5 shrink-0 items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-components-input-bg-hover hover:text-text-secondary',
- resolveClassName(className, state),
- )
- }
- {...props}
- >
- {children ?? <span className="i-ri-close-line size-4" aria-hidden="true" />}
- </Menu.Clear>
- )
-}
-
-type DropdownMenuEmptyProps = Menu.Empty.Props
-
-// Same look as `ComboboxEmpty`; change both together.
-function DropdownMenuEmpty({ className, ...props }: DropdownMenuEmptyProps) {
- return (
- <Menu.Empty
- className={(state) =>
- cn('px-3 py-2 system-sm-regular text-text-tertiary', resolveClassName(className, state))
- }
- {...props}
- />
- )
-}
-
-type DropdownMenuListProps = Menu.List.Props
-
-// The popup keeps its vertical padding and the items keep their inset, so the list adds none.
-// Filtering hides a group whose items all match out, so a separator between groups goes at the
-// start of the later group and shows only while a visible group precedes it. Every separator
-// directly inside a group follows that rule, so separate items with groups, not with a separator
-// among them. A separator placed directly in the list is not managed.
-function DropdownMenuList({ className, ...props }: DropdownMenuListProps) {
- return (
- <Menu.List
- className={(state) =>
- cn(
- 'max-h-80 min-h-0 overflow-x-hidden overflow-y-auto overscroll-contain outline-hidden',
- '[&>:not([hidden])~[role=group]:not([hidden])>[role=separator]]:block [&>[role=group]>[role=separator]]:hidden',
- resolveClassName(className, state),
- )
- }
- {...props}
- />
- )
-}
-type DropdownMenuRadioGroupChangeEventReason = Menu.RadioGroup.ChangeEventReason
-type DropdownMenuRadioGroupChangeEventDetails = Menu.RadioGroup.ChangeEventDetails
-type DropdownMenuRadioGroupProps<Value = unknown> = Omit<
- Menu.RadioGroup.Props,
- 'defaultValue' | 'onValueChange' | 'value'
-> & {
- defaultValue?: Value
- onValueChange?: (value: Value, eventDetails: DropdownMenuRadioGroupChangeEventDetails) => void
- value?: Value
-}
-type DropdownMenuItemVariant = MenuItemVariant
-
-function DropdownMenuRadioGroup<Value = unknown>(
- props: DropdownMenuRadioGroupProps<Value>,
-): React.JSX.Element {
- return <Menu.RadioGroup {...props} />
-}
-
-type DropdownMenuRadioItemProps<Value = unknown> = Omit<Menu.RadioItem.Props, 'value'> & {
- value: Value
-}
-
-function DropdownMenuRadioItem<Value = unknown>({
- className,
- ...props
-}: DropdownMenuRadioItemProps<Value>) {
- return (
- <Menu.RadioItem
- className={(state) => cn(menuItemClassName, resolveClassName(className, state))}
- {...props}
- />
- )
-}
-
-function DropdownMenuRadioItemIndicator({
- className,
- ...props
-}: DropdownMenuRadioItemIndicatorProps) {
- return (
- <Menu.RadioItemIndicator
- className={(state) => cn(floatingItemIndicatorClassName, resolveClassName(className, state))}
- {...props}
- >
- <span aria-hidden className="i-ri-check-line h-4 w-4" />
- </Menu.RadioItemIndicator>
- )
-}
-
-type DropdownMenuRadioItemIndicatorProps = Omit<Menu.RadioItemIndicator.Props, 'children'>
-
-type DropdownMenuCheckboxItemProps = Menu.CheckboxItem.Props
-type DropdownMenuCheckboxItemChangeEventReason = Menu.CheckboxItem.ChangeEventReason
-type DropdownMenuCheckboxItemChangeEventDetails = Menu.CheckboxItem.ChangeEventDetails
-
-function DropdownMenuCheckboxItem({ className, ...props }: DropdownMenuCheckboxItemProps) {
- return (
- <Menu.CheckboxItem
- className={(state) => cn(menuItemClassName, resolveClassName(className, state))}
- {...props}
- />
- )
-}
-
-function DropdownMenuCheckboxItemIndicator({
- className,
- ...props
-}: DropdownMenuCheckboxItemIndicatorProps) {
- return (
- <Menu.CheckboxItemIndicator
- className={(state) => cn(floatingItemIndicatorClassName, resolveClassName(className, state))}
- {...props}
- >
- <span aria-hidden className="i-ri-check-line h-4 w-4" />
- </Menu.CheckboxItemIndicator>
- )
-}
-
-type DropdownMenuCheckboxItemIndicatorProps = Omit<Menu.CheckboxItemIndicator.Props, 'children'>
-
-type DropdownMenuGroupLabelProps = Menu.GroupLabel.Props
-
-function DropdownMenuGroupLabel({ className, ...props }: DropdownMenuGroupLabelProps) {
- return (
- <Menu.GroupLabel
- className={(state) =>
- cn(floatingGroupLabelClassName, 'px-3', resolveClassName(className, state))
- }
- {...props}
- />
- )
-}
-
-type DropdownMenuPositionerProps = Menu.Positioner.Props
-
-function DropdownMenuPositioner({
- className,
- sideOffset = 4,
- ...props
-}: DropdownMenuPositionerProps) {
- return (
- <Menu.Positioner
- sideOffset={sideOffset}
- className={(state) => cn(positionerClassName, resolveClassName(className, state))}
- {...props}
- />
- )
-}
-
-type DropdownMenuPopupProps = Menu.Popup.Props
-
-// When a `DropdownMenuList` is rendered, Base UI hands the `menu` role to it and the popup becomes a
-// column that never scrolls itself, so the list scrolls and anything else in the popup stays put.
-function DropdownMenuPopup({ className, ...props }: DropdownMenuPopupProps) {
- return (
- <Menu.Popup
- className={(state) =>
- cn(
- menuPopupBaseClassName,
- 'not-[[role=menu]]:flex not-[[role=menu]]:flex-col not-[[role=menu]]:overflow-hidden',
- floatingPopupAnimationClassName,
- resolveClassName(className, state),
- )
- }
- {...props}
- />
- )
-}
-
-type DropdownMenuContentProps = Omit<DropdownMenuPopupProps, 'children'> &
- Pick<DropdownMenuPositionerProps, 'side' | 'align' | 'alignOffset' | 'sideOffset'> & {
- children: React.ReactNode
- }
-
-function DropdownMenuContent({
- children,
- side,
- align = 'end',
- sideOffset,
- alignOffset,
- className,
- ...props
-}: DropdownMenuContentProps) {
- return (
- <DropdownMenuPortal>
- <DropdownMenuPositioner
- side={side}
- align={align}
- sideOffset={sideOffset}
- alignOffset={alignOffset}
- >
- <DropdownMenuPopup
- className={(state) => cn(menuPopupSurfaceClassName, resolveClassName(className, state))}
- {...props}
- >
- {children}
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- )
-}
-
-type DropdownMenuSubTriggerProps = Menu.SubmenuTrigger.Props & {
- variant?: DropdownMenuItemVariant
-}
-
-function DropdownMenuSubTrigger({
- className,
- variant = 'default',
- children,
- ...props
-}: DropdownMenuSubTriggerProps) {
- return (
- <Menu.SubmenuTrigger
- data-variant={variant}
- className={(state) =>
- cn(menuItemClassName, menuItemDestructiveClassName, resolveClassName(className, state))
- }
- {...props}
- >
- {children}
- <span
- aria-hidden
- className="ms-auto i-ri-arrow-right-s-line size-4 shrink-0 text-text-tertiary [&:dir(rtl)]:-scale-x-100"
- />
- </Menu.SubmenuTrigger>
- )
-}
-
-type DropdownMenuSubContentProps = DropdownMenuContentProps
-
-function DropdownMenuSubContent({
- children,
- side,
- align,
- sideOffset,
- alignOffset,
- className,
- ...props
-}: DropdownMenuSubContentProps) {
- return (
- <DropdownMenuPortal>
- <DropdownMenuPositioner
- side={side}
- align={align}
- sideOffset={sideOffset}
- alignOffset={alignOffset}
- >
- <DropdownMenuPopup
- className={(state) => cn(menuPopupSurfaceClassName, resolveClassName(className, state))}
- {...props}
- >
- {children}
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- )
-}
-
-type DropdownMenuItemProps = Menu.Item.Props & {
- variant?: DropdownMenuItemVariant
-}
-
-function DropdownMenuItem({ className, variant = 'default', ...props }: DropdownMenuItemProps) {
- return (
- <Menu.Item
- data-variant={variant}
- className={(state) =>
- cn(menuItemClassName, menuItemDestructiveClassName, resolveClassName(className, state))
- }
- {...props}
- />
- )
-}
-
-type DropdownMenuLinkItemProps = Menu.LinkItem.Props & {
- variant?: DropdownMenuItemVariant
-}
-
-function DropdownMenuLinkItem({
- className,
- variant = 'default',
- closeOnClick = true,
- ...props
-}: DropdownMenuLinkItemProps) {
- return (
- <Menu.LinkItem
- data-variant={variant}
- className={(state) =>
- cn(menuItemClassName, menuItemDestructiveClassName, resolveClassName(className, state))
- }
- closeOnClick={closeOnClick}
- {...props}
- />
- )
-}
-
-type DropdownMenuSeparatorProps = Menu.Separator.Props
-
-function DropdownMenuSeparator({ className, ...props }: DropdownMenuSeparatorProps) {
- return (
- <Menu.Separator
- className={(state) => cn(floatingSeparatorClassName, resolveClassName(className, state))}
- {...props}
- />
- )
-}
-
-export {
- createDropdownMenuHandle,
- DropdownMenu,
- DropdownMenuCheckboxItem,
- DropdownMenuCheckboxItemIndicator,
- DropdownMenuClear,
- DropdownMenuContent,
- DropdownMenuEmpty,
- DropdownMenuFilterProvider,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuList,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuSeparator,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
- DropdownMenuTrigger,
- useDropdownMenuFilter,
-}
-
-export type {
- DropdownMenuActions,
- DropdownMenuChangeEventDetails,
- DropdownMenuChangeEventReason,
- DropdownMenuCheckboxItemChangeEventDetails,
- DropdownMenuCheckboxItemChangeEventReason,
- DropdownMenuCheckboxItemIndicatorProps,
- DropdownMenuCheckboxItemProps,
- DropdownMenuClearProps,
- DropdownMenuContentProps,
- DropdownMenuEmptyProps,
- DropdownMenuFilterProviderChangeEventDetails,
- DropdownMenuFilterProviderChangeEventReason,
- DropdownMenuFilterProviderProps,
- DropdownMenuGroupLabelProps,
- DropdownMenuGroupProps,
- DropdownMenuHandle,
- DropdownMenuHighlightEventDetails,
- DropdownMenuHighlightEventReason,
- DropdownMenuInputGroupProps,
- DropdownMenuInputProps,
- DropdownMenuItemProps,
- DropdownMenuLinkItemProps,
- DropdownMenuListProps,
- DropdownMenuPopupProps,
- DropdownMenuPortalProps,
- DropdownMenuPositionerProps,
- DropdownMenuProps,
- DropdownMenuRadioGroupChangeEventDetails,
- DropdownMenuRadioGroupChangeEventReason,
- DropdownMenuRadioGroupProps,
- DropdownMenuRadioItemIndicatorProps,
- DropdownMenuRadioItemProps,
- DropdownMenuSeparatorProps,
- DropdownMenuSubChangeEventDetails,
- DropdownMenuSubChangeEventReason,
- DropdownMenuSubContentProps,
- DropdownMenuSubProps,
- DropdownMenuSubTriggerProps,
- DropdownMenuTriggerProps,
-}
diff --git a/packages/dify-ui/src/input-group/index.stories.tsx b/packages/dify-ui/src/input-group/index.stories.tsx
index 519edb51276..ddafe1a2b2d 100644
--- a/packages/dify-ui/src/input-group/index.stories.tsx
+++ b/packages/dify-ui/src/input-group/index.stories.tsx
@@ -2,14 +2,9 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
import * as React from 'react'
import { expect, spyOn, waitFor, waitForElementToBeRemoved, within } from 'storybook/test'
import { Button } from '../button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '../dropdown-menu'
import { Field, FieldDescription, FieldError, FieldLabel } from '../field'
import { IconButton } from '../icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '../menu'
import { InputGroup, InputGroupAddon, InputGroupInput } from './index'
const meta = {
@@ -142,8 +137,8 @@ function InputGroupDropdownDemo() {
<InputGroup>
<InputGroupInput defaultValue="report.md" />
<InputGroupAddon align="inline-end">
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
size="md"
@@ -154,11 +149,11 @@ function InputGroupDropdownDemo() {
</IconButton>
}
/>
- <DropdownMenuContent side="bottom" align="end" sideOffset={8}>
- <DropdownMenuItem>Settings</DropdownMenuItem>
- <DropdownMenuItem>Copy path</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent side="bottom" align="end" sideOffset={8}>
+ <MenuItem>Settings</MenuItem>
+ <MenuItem>Copy path</MenuItem>
+ </MenuContent>
+ </Menu>
</InputGroupAddon>
</InputGroup>
</Field>
diff --git a/packages/dify-ui/src/dropdown-menu/__tests__/index.spec.tsx b/packages/dify-ui/src/menu/__tests__/index.spec.tsx
similarity index 65%
rename from packages/dify-ui/src/dropdown-menu/__tests__/index.spec.tsx
rename to packages/dify-ui/src/menu/__tests__/index.spec.tsx
index de76beb8711..6a42cdb55c1 100644
--- a/packages/dify-ui/src/dropdown-menu/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/menu/__tests__/index.spec.tsx
@@ -2,24 +2,23 @@ import type * as React from 'react'
import { page, userEvent } from 'vite-plus/test/browser'
import { render } from 'vitest-browser-react'
import {
- DropdownMenu,
- DropdownMenuClear,
- DropdownMenuContent,
- DropdownMenuEmpty,
- DropdownMenuFilterProvider,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuList,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuSeparator,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
- DropdownMenuTrigger,
+ Menu,
+ MenuClear,
+ MenuContent,
+ MenuEmpty,
+ MenuFilterProvider,
+ MenuInput,
+ MenuInputGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuList,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuSeparator,
+ MenuSubmenu,
+ MenuSubmenuTrigger,
+ MenuTrigger,
} from '../index'
const renderWithSafeViewport = (ui: React.ReactNode) =>
@@ -27,30 +26,30 @@ const renderWithSafeViewport = (ui: React.ReactNode) =>
function FilterableMenu({ items = ['Rename workspace', 'Manage billing'] }: { items?: string[] }) {
return (
- <DropdownMenuFilterProvider>
- <DropdownMenu open>
- <DropdownMenuTrigger>Workspace actions</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuInputGroup>
+ <MenuFilterProvider>
+ <Menu open>
+ <MenuTrigger>Workspace actions</MenuTrigger>
+ <MenuContent>
+ <MenuInputGroup>
<span aria-hidden="true" data-testid="search-icon">
🔍
</span>
- <DropdownMenuInput aria-label="Filter actions" />
- <DropdownMenuClear data-testid="clear" />
- </DropdownMenuInputGroup>
- <DropdownMenuEmpty>No actions match</DropdownMenuEmpty>
- <DropdownMenuList>
+ <MenuInput aria-label="Filter actions" />
+ <MenuClear data-testid="clear" />
+ </MenuInputGroup>
+ <MenuEmpty>No actions match</MenuEmpty>
+ <MenuList>
{items.map((item) => (
- <DropdownMenuItem key={item}>{item}</DropdownMenuItem>
+ <MenuItem key={item}>{item}</MenuItem>
))}
- </DropdownMenuList>
- </DropdownMenuContent>
- </DropdownMenu>
- </DropdownMenuFilterProvider>
+ </MenuList>
+ </MenuContent>
+ </Menu>
+ </MenuFilterProvider>
)
}
-describe('dropdown-menu wrapper', () => {
+describe('menu wrapper', () => {
describe('filtering', () => {
it('should focus the filter input when the input group surface is pressed', async () => {
const screen = await renderWithSafeViewport(<FilterableMenu />)
@@ -139,19 +138,19 @@ describe('dropdown-menu wrapper', () => {
})
})
- describe('DropdownMenuContent', () => {
- it('should position content at bottom-end with default placement when props are omitted', async () => {
+ describe('MenuContent', () => {
+ it('should inherit bottom-center positioning when props are omitted', async () => {
const screen = await renderWithSafeViewport(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem>Content action</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuItem>Content action</MenuItem>
+ </MenuContent>
+ </Menu>,
)
await expect.element(screen.getByRole('menu')).toHaveAttribute('data-side', 'bottom')
- await expect.element(screen.getByRole('menu')).toHaveAttribute('data-align', 'end')
+ await expect.element(screen.getByRole('menu')).toHaveAttribute('data-align', 'center')
await expect
.element(screen.getByRole('menuitem', { name: 'Content action' }))
.toBeInTheDocument()
@@ -159,12 +158,12 @@ describe('dropdown-menu wrapper', () => {
it('should apply custom placement when custom positioning props are provided', async () => {
const screen = await renderWithSafeViewport(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent side="top" align="start" sideOffset={12} alignOffset={-3}>
- <DropdownMenuItem>Custom content</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent side="top" align="start" sideOffset={12} alignOffset={-3}>
+ <MenuItem>Custom content</MenuItem>
+ </MenuContent>
+ </Menu>,
)
await expect.element(screen.getByRole('menu')).toHaveAttribute('data-side', 'top')
@@ -178,12 +177,12 @@ describe('dropdown-menu wrapper', () => {
const handlePopupClick = vi.fn()
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent id="dropdown-content-popup" onClick={handlePopupClick}>
- <DropdownMenuItem>Passthrough content</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent id="dropdown-content-popup" onClick={handlePopupClick}>
+ <MenuItem>Passthrough content</MenuItem>
+ </MenuContent>
+ </Menu>,
)
await screen.getByRole('menu').click()
@@ -194,16 +193,16 @@ describe('dropdown-menu wrapper', () => {
it('should support explicit anatomy when the positioner needs custom props', async () => {
const screen = await renderWithSafeViewport(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuPositioner data-testid="custom-positioner" side="top" align="start">
- <DropdownMenuPopup>
- <DropdownMenuItem>Anatomy action</DropdownMenuItem>
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuPortal>
+ <MenuPositioner data-testid="custom-positioner" side="top" align="start">
+ <MenuPopup>
+ <MenuItem>Anatomy action</MenuItem>
+ </MenuPopup>
+ </MenuPositioner>
+ </MenuPortal>
+ </Menu>,
)
await expect
@@ -215,20 +214,21 @@ describe('dropdown-menu wrapper', () => {
})
})
- describe('DropdownMenuSubContent', () => {
+ describe('MenuContent inside a submenu', () => {
it('should place sub-content inline-end-start when side and align are omitted', async () => {
+ await page.viewport(1024, 768)
const screen = await renderWithSafeViewport(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuSub open>
- <DropdownMenuSubTrigger>More actions</DropdownMenuSubTrigger>
- <DropdownMenuSubContent>
- <DropdownMenuItem>Sub action</DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuSubmenu open>
+ <MenuSubmenuTrigger>More actions</MenuSubmenuTrigger>
+ <MenuContent>
+ <MenuItem>Sub action</MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ </MenuContent>
+ </Menu>,
)
const submenu = screen.getByRole('menu', { name: 'More actions' })
@@ -251,12 +251,12 @@ describe('dropdown-menu wrapper', () => {
const handlePopupClick = vi.fn()
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuSub open>
- <DropdownMenuSubTrigger>More actions</DropdownMenuSubTrigger>
- <DropdownMenuSubContent
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuSubmenu open>
+ <MenuSubmenuTrigger>More actions</MenuSubmenuTrigger>
+ <MenuContent
side="right"
align="end"
sideOffset={6}
@@ -264,11 +264,11 @@ describe('dropdown-menu wrapper', () => {
id="dropdown-sub-popup"
onClick={handlePopupClick}
>
- <DropdownMenuItem>Custom sub action</DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <MenuItem>Custom sub action</MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ </MenuContent>
+ </Menu>,
)
await screen.getByRole('menu', { name: 'More actions' }).click()
@@ -286,17 +286,17 @@ describe('dropdown-menu wrapper', () => {
})
})
- describe('DropdownMenuSubTrigger', () => {
+ describe('MenuSubmenuTrigger', () => {
it('should render submenu trigger content when trigger children are provided', async () => {
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuSub open>
- <DropdownMenuSubTrigger>Trigger item</DropdownMenuSubTrigger>
- </DropdownMenuSub>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuSubmenu open>
+ <MenuSubmenuTrigger>Trigger item</MenuSubmenuTrigger>
+ </MenuSubmenu>
+ </MenuContent>
+ </Menu>,
)
await expect
@@ -310,21 +310,21 @@ describe('dropdown-menu wrapper', () => {
const handleClick = vi.fn()
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuSub open>
- <DropdownMenuSubTrigger
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuSubmenu open>
+ <MenuSubmenuTrigger
variant={variant}
aria-label="submenu action"
id={`submenu-trigger-${variant}`}
onClick={handleClick}
>
Trigger item
- </DropdownMenuSubTrigger>
- </DropdownMenuSub>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuSubmenuTrigger>
+ </MenuSubmenu>
+ </MenuContent>
+ </Menu>,
)
await screen.getByRole('menuitem', { name: 'submenu action' }).click()
@@ -339,26 +339,26 @@ describe('dropdown-menu wrapper', () => {
)
})
- describe('DropdownMenuItem', () => {
+ describe('MenuItem', () => {
it.each(['default', 'destructive'] as const)(
'should remain interactive and set data-variant when variant is %s',
async (variant) => {
const handleClick = vi.fn()
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuItem
variant={variant}
aria-label="menu action"
id={`menu-item-${variant}`}
onClick={handleClick}
>
Item label
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuItem>
+ </MenuContent>
+ </Menu>,
)
await screen.getByRole('menuitem', { name: 'menu action' }).click()
@@ -373,21 +373,17 @@ describe('dropdown-menu wrapper', () => {
)
})
- describe('DropdownMenuLinkItem', () => {
+ describe('MenuLinkItem', () => {
it('should render as anchor and keep href/target attributes when link props are provided', async () => {
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuLinkItem
- href="https://example.com/docs"
- target="_blank"
- rel="noopener noreferrer"
- >
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuLinkItem href="https://example.com/docs" target="_blank" rel="noopener noreferrer">
Docs
- </DropdownMenuLinkItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuLinkItem>
+ </MenuContent>
+ </Menu>,
)
const link = screen.getByRole('menuitem', { name: 'Docs' }).element()
@@ -399,18 +395,18 @@ describe('dropdown-menu wrapper', () => {
it('should keep link semantics and not leak closeOnClick prop when closeOnClick is false', async () => {
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuLinkItem
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuLinkItem
href="https://example.com/docs"
closeOnClick={false}
aria-label="docs link"
>
Docs
- </DropdownMenuLinkItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuLinkItem>
+ </MenuContent>
+ </Menu>,
)
const link = screen.getByRole('menuitem', { name: 'docs link' }).element()
@@ -421,14 +417,14 @@ describe('dropdown-menu wrapper', () => {
it('should preserve link semantics when render prop uses a custom anchor element', async () => {
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuLinkItem render={<a href="/account" />} aria-label="account link">
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuLinkItem render={<a href="/account" />} aria-label="account link">
Account settings
- </DropdownMenuLinkItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuLinkItem>
+ </MenuContent>
+ </Menu>,
)
const link = screen.getByRole('menuitem', { name: 'account link' }).element()
@@ -443,10 +439,10 @@ describe('dropdown-menu wrapper', () => {
const handleClick = vi.fn()
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuLinkItem
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuLinkItem
variant={variant}
href="https://example.com/docs"
aria-label="docs link"
@@ -457,9 +453,9 @@ describe('dropdown-menu wrapper', () => {
}}
>
Docs
- </DropdownMenuLinkItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuLinkItem>
+ </MenuContent>
+ </Menu>,
)
await screen.getByRole('menuitem', { name: 'docs link' }).click()
@@ -473,17 +469,17 @@ describe('dropdown-menu wrapper', () => {
)
})
- describe('DropdownMenuSeparator', () => {
+ describe('MenuSeparator', () => {
it('should keep surrounding menu rows rendered when separator is placed between items', async () => {
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger aria-label="menu trigger">Open</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem>First action</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem>Second action</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger aria-label="menu trigger">Open</MenuTrigger>
+ <MenuContent>
+ <MenuItem>First action</MenuItem>
+ <MenuSeparator />
+ <MenuItem>Second action</MenuItem>
+ </MenuContent>
+ </Menu>,
)
await expect
@@ -499,19 +495,17 @@ describe('dropdown-menu wrapper', () => {
it('resolves submenu popup classes with the popup state', async () => {
const screen = await render(
- <DropdownMenu open>
- <DropdownMenuTrigger>Open audit menu</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuSub open>
- <DropdownMenuSubTrigger>More audit actions</DropdownMenuSubTrigger>
- <DropdownMenuSubContent
- className={(state) => (state.open ? 'opacity-50' : 'opacity-100')}
- >
- <DropdownMenuItem>Audit action</DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu open>
+ <MenuTrigger>Open audit menu</MenuTrigger>
+ <MenuContent>
+ <MenuSubmenu open>
+ <MenuSubmenuTrigger>More audit actions</MenuSubmenuTrigger>
+ <MenuContent className={(state) => (state.open ? 'opacity-50' : 'opacity-100')}>
+ <MenuItem>Audit action</MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ </MenuContent>
+ </Menu>,
)
await expect
diff --git a/packages/dify-ui/src/menu/__tests__/types.tsx b/packages/dify-ui/src/menu/__tests__/types.tsx
new file mode 100644
index 00000000000..bc34deff483
--- /dev/null
+++ b/packages/dify-ui/src/menu/__tests__/types.tsx
@@ -0,0 +1,54 @@
+import type { Menu as BaseMenu } from '@base-ui/react/menu'
+import type { MenuActions, MenuContentProps, MenuHandle, MenuProps } from '@langgenius/dify-ui/menu'
+import { createMenuHandle, Menu, MenuContent, MenuTrigger } from '@langgenius/dify-ui/menu'
+import * as React from 'react'
+import { expectTypeOf } from 'vite-plus/test'
+
+type Payload = { documentId: string }
+
+export function menuTypeContracts() {
+ const handle = createMenuHandle<Payload>()
+ expectTypeOf(handle).toEqualTypeOf<MenuHandle<Payload>>()
+ const trigger = (
+ <MenuTrigger handle={handle} payload={{ documentId: 'document-1' }}>
+ Actions
+ </MenuTrigger>
+ )
+ const menu = (
+ <Menu handle={handle}>
+ {({ payload }) => {
+ expectTypeOf(payload).toEqualTypeOf<Payload | undefined>()
+ return <span>{payload?.documentId}</span>
+ }}
+ </Menu>
+ )
+ const invalid = (
+ // @ts-expect-error Detached triggers preserve the handle payload contract.
+ <MenuTrigger handle={handle} payload={{ documentId: 1 }}>
+ Actions
+ </MenuTrigger>
+ )
+ return { trigger, menu, invalid }
+}
+
+export function menuActionsTypeContract() {
+ const actionsRef = React.createRef<MenuActions>()
+ expectTypeOf(actionsRef.current).toEqualTypeOf<NonNullable<MenuProps['actionsRef']>['current']>()
+ return <Menu actionsRef={actionsRef} />
+}
+
+export function menuPositioningTypeContracts() {
+ type Positioning = 'side' | 'align' | 'sideOffset' | 'alignOffset'
+ expectTypeOf<Pick<MenuContentProps, Positioning>>().toEqualTypeOf<
+ Pick<BaseMenu.Positioner.Props, Positioning>
+ >()
+ const inherited = <MenuContent>Actions</MenuContent>
+ const independent = <MenuContent align="end">Actions</MenuContent>
+ const invalidSide = (
+ // @ts-expect-error Combined placement strings are not valid sides.
+ <MenuContent side="inline-end-start">Actions</MenuContent>
+ )
+ // @ts-expect-error Logical sides are not alignments.
+ const invalidAlign = <MenuContent align="inline-end">Actions</MenuContent>
+ return { inherited, independent, invalidSide, invalidAlign }
+}
diff --git a/packages/dify-ui/src/dropdown-menu/index.stories.tsx b/packages/dify-ui/src/menu/index.stories.tsx
similarity index 59%
rename from packages/dify-ui/src/dropdown-menu/index.stories.tsx
rename to packages/dify-ui/src/menu/index.stories.tsx
index f06baf9d090..b8b4909c615 100644
--- a/packages/dify-ui/src/dropdown-menu/index.stories.tsx
+++ b/packages/dify-ui/src/menu/index.stories.tsx
@@ -2,35 +2,34 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
import * as React from 'react'
import { expect, userEvent, waitFor, within } from 'storybook/test'
import {
- createDropdownMenuHandle,
- DropdownMenu,
- DropdownMenuCheckboxItem,
- DropdownMenuCheckboxItemIndicator,
- DropdownMenuClear,
- DropdownMenuContent,
- DropdownMenuEmpty,
- DropdownMenuFilterProvider,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuList,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuSeparator,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
- DropdownMenuTrigger,
+ createMenuHandle,
+ Menu,
+ MenuCheckboxItem,
+ MenuCheckboxItemIndicator,
+ MenuClear,
+ MenuContent,
+ MenuEmpty,
+ MenuFilterProvider,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuInput,
+ MenuInputGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuList,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuSeparator,
+ MenuSubmenu,
+ MenuSubmenuTrigger,
+ MenuTrigger,
} from '.'
import { DirectionProvider } from '../direction-provider'
function TriggerButton({ label = 'Open Menu' }: { label?: string }) {
return (
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<button
type="button"
@@ -39,113 +38,113 @@ function TriggerButton({ label = 'Open Menu' }: { label?: string }) {
}
>
{label}
- </DropdownMenuTrigger>
+ </MenuTrigger>
)
}
const meta = {
- title: 'Base/UI/DropdownMenu',
- component: DropdownMenu,
+ title: 'Base/UI/Menu',
+ component: Menu,
parameters: {
layout: 'centered',
docs: {
description: {
component:
- 'Compound dropdown menu built on Base UI Menu. Supports items, separators, group labels, submenus, radio groups, checkbox items, destructive items, disabled states, and filtering. Filtering is a Base UI preview feature: wrap `DropdownMenu` in `DropdownMenuFilterProvider`, place `DropdownMenuInput` in a `DropdownMenuInputGroup` inside the content, and put the items in `DropdownMenuList`. The popup then becomes a dialog that holds the searchbox and the menu.',
+ 'Compound dropdown menu built on Base UI Menu. Supports items, separators, group labels, submenus, radio groups, checkbox items, destructive items, disabled states, and filtering. Filtering is a Base UI preview feature: wrap `Menu` in `MenuFilterProvider`, place `MenuInput` in a `MenuInputGroup` inside the content, and put the items in `MenuList`. The popup then becomes a dialog that holds the searchbox and the menu.',
},
},
},
tags: ['autodocs'],
-} satisfies Meta<typeof DropdownMenu>
+} satisfies Meta<typeof Menu>
export default meta
type Story = StoryObj<typeof meta>
export const Default: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuItem>Edit</DropdownMenuItem>
- <DropdownMenuItem>Duplicate</DropdownMenuItem>
- <DropdownMenuItem>Archive</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuItem>Edit</MenuItem>
+ <MenuItem>Duplicate</MenuItem>
+ <MenuItem>Archive</MenuItem>
+ </MenuContent>
+ </Menu>
),
}
export const WithSeparator: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuItem>Cut</DropdownMenuItem>
- <DropdownMenuItem>Copy</DropdownMenuItem>
- <DropdownMenuItem>Paste</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem>Select All</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem>Find and Replace</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuItem>Cut</MenuItem>
+ <MenuItem>Copy</MenuItem>
+ <MenuItem>Paste</MenuItem>
+ <MenuSeparator />
+ <MenuItem>Select All</MenuItem>
+ <MenuSeparator />
+ <MenuItem>Find and Replace</MenuItem>
+ </MenuContent>
+ </Menu>
),
}
export const WithGroupLabel: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>Actions</DropdownMenuGroupLabel>
- <DropdownMenuItem>Edit</DropdownMenuItem>
- <DropdownMenuItem>Duplicate</DropdownMenuItem>
- </DropdownMenuGroup>
- <DropdownMenuSeparator />
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>Export</DropdownMenuGroupLabel>
- <DropdownMenuItem>Export as PDF</DropdownMenuItem>
- <DropdownMenuItem>Export as CSV</DropdownMenuItem>
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuGroup>
+ <MenuGroupLabel>Actions</MenuGroupLabel>
+ <MenuItem>Edit</MenuItem>
+ <MenuItem>Duplicate</MenuItem>
+ </MenuGroup>
+ <MenuSeparator />
+ <MenuGroup>
+ <MenuGroupLabel>Export</MenuGroupLabel>
+ <MenuItem>Export as PDF</MenuItem>
+ <MenuItem>Export as CSV</MenuItem>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
),
}
export const WithDestructiveItem: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuItem>Edit</DropdownMenuItem>
- <DropdownMenuItem>Duplicate</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem variant="destructive">Delete</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuItem>Edit</MenuItem>
+ <MenuItem>Duplicate</MenuItem>
+ <MenuSeparator />
+ <MenuItem variant="destructive">Delete</MenuItem>
+ </MenuContent>
+ </Menu>
),
}
export const WithSubmenu: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuItem>New File</DropdownMenuItem>
- <DropdownMenuItem>Open</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Share</DropdownMenuSubTrigger>
- <DropdownMenuSubContent>
- <DropdownMenuItem>Email</DropdownMenuItem>
- <DropdownMenuItem>Slack</DropdownMenuItem>
- <DropdownMenuItem>Copy Link</DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- <DropdownMenuSeparator />
- <DropdownMenuItem>Download</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuItem>New File</MenuItem>
+ <MenuItem>Open</MenuItem>
+ <MenuSeparator />
+ <MenuSubmenu>
+ <MenuSubmenuTrigger>Share</MenuSubmenuTrigger>
+ <MenuContent>
+ <MenuItem>Email</MenuItem>
+ <MenuItem>Slack</MenuItem>
+ <MenuItem>Copy Link</MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ <MenuSeparator />
+ <MenuItem>Download</MenuItem>
+ </MenuContent>
+ </Menu>
),
}
@@ -166,21 +165,21 @@ export const RTL: Story = {
dir="rtl"
className="flex min-h-64 w-[min(36rem,calc(100vw-2rem))] items-start"
>
- <DropdownMenu>
+ <Menu>
<TriggerButton label="الإجراءات" />
- <DropdownMenuContent lang="ar" dir="rtl">
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>
+ <MenuContent lang="ar" dir="rtl">
+ <MenuSubmenu>
+ <MenuSubmenuTrigger>
<span>مشاركة</span>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent lang="ar" dir="rtl">
- <DropdownMenuItem>البريد الإلكتروني</DropdownMenuItem>
- <DropdownMenuItem>نسخ الرابط</DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- <DropdownMenuItem>تنزيل</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuSubmenuTrigger>
+ <MenuContent lang="ar" dir="rtl">
+ <MenuItem>البريد الإلكتروني</MenuItem>
+ <MenuItem>نسخ الرابط</MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ <MenuItem>تنزيل</MenuItem>
+ </MenuContent>
+ </Menu>
</div>
</DirectionProvider>
),
@@ -227,25 +226,25 @@ function WithRadioItemsDemo() {
const [density, setDensity] = React.useState<Density>('comfortable')
return (
- <DropdownMenu>
+ <Menu>
<TriggerButton label={`Density: ${density}`} />
- <DropdownMenuContent>
- <DropdownMenuRadioGroup<Density> value={density} onValueChange={setDensity}>
- <DropdownMenuRadioItem<Density> value="compact">
+ <MenuContent>
+ <MenuRadioGroup<Density> value={density} onValueChange={setDensity}>
+ <MenuRadioItem<Density> value="compact">
Compact
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<Density> value="comfortable">
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ <MenuRadioItem<Density> value="comfortable">
Comfortable
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<Density> value="spacious">
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ <MenuRadioItem<Density> value="spacious">
Spacious
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
@@ -259,23 +258,23 @@ function WithCheckboxItemsDemo() {
const [showStatusBar, setShowStatusBar] = React.useState(true)
return (
- <DropdownMenu>
+ <Menu>
<TriggerButton label="View Options" />
- <DropdownMenuContent>
- <DropdownMenuCheckboxItem checked={showToolbar} onCheckedChange={setShowToolbar}>
+ <MenuContent>
+ <MenuCheckboxItem checked={showToolbar} onCheckedChange={setShowToolbar}>
Toolbar
- <DropdownMenuCheckboxItemIndicator />
- </DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem checked={showSidebar} onCheckedChange={setShowSidebar}>
+ <MenuCheckboxItemIndicator />
+ </MenuCheckboxItem>
+ <MenuCheckboxItem checked={showSidebar} onCheckedChange={setShowSidebar}>
Sidebar
- <DropdownMenuCheckboxItemIndicator />
- </DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem checked={showStatusBar} onCheckedChange={setShowStatusBar}>
+ <MenuCheckboxItemIndicator />
+ </MenuCheckboxItem>
+ <MenuCheckboxItem checked={showStatusBar} onCheckedChange={setShowStatusBar}>
Status Bar
- <DropdownMenuCheckboxItemIndicator />
- </DropdownMenuCheckboxItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuCheckboxItemIndicator />
+ </MenuCheckboxItem>
+ </MenuContent>
+ </Menu>
)
}
@@ -285,64 +284,60 @@ export const WithCheckboxItems: Story = {
export const WithDisabledItems: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuItem>Edit</DropdownMenuItem>
- <DropdownMenuItem disabled>Duplicate</DropdownMenuItem>
- <DropdownMenuItem>Archive</DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem disabled>Restore</DropdownMenuItem>
- <DropdownMenuItem variant="destructive">Delete</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuContent>
+ <MenuItem>Edit</MenuItem>
+ <MenuItem disabled>Duplicate</MenuItem>
+ <MenuItem>Archive</MenuItem>
+ <MenuSeparator />
+ <MenuItem disabled>Restore</MenuItem>
+ <MenuItem variant="destructive">Delete</MenuItem>
+ </MenuContent>
+ </Menu>
),
}
export const WithIcons: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton />
- <DropdownMenuContent>
- <DropdownMenuItem>
+ <MenuContent>
+ <MenuItem>
<span aria-hidden className="i-ri-pencil-line size-4 shrink-0 text-text-tertiary" />
Edit
- </DropdownMenuItem>
- <DropdownMenuItem>
+ </MenuItem>
+ <MenuItem>
<span aria-hidden className="i-ri-file-copy-line size-4 shrink-0 text-text-tertiary" />
Duplicate
- </DropdownMenuItem>
- <DropdownMenuItem>
+ </MenuItem>
+ <MenuItem>
<span aria-hidden className="i-ri-archive-line size-4 shrink-0 text-text-tertiary" />
Archive
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem variant="destructive">
+ </MenuItem>
+ <MenuSeparator />
+ <MenuItem variant="destructive">
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
Delete
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
),
}
export const WithLinkItems: Story = {
render: () => (
- <DropdownMenu>
+ <Menu>
<TriggerButton label="Open links" />
- <DropdownMenuContent>
- <DropdownMenuLinkItem href="https://docs.dify.ai" rel="noopener noreferrer" target="_blank">
+ <MenuContent>
+ <MenuLinkItem href="https://docs.dify.ai" rel="noopener noreferrer" target="_blank">
Dify Docs
- </DropdownMenuLinkItem>
- <DropdownMenuLinkItem
- href="https://roadmap.dify.ai"
- rel="noopener noreferrer"
- target="_blank"
- >
+ </MenuLinkItem>
+ <MenuLinkItem href="https://roadmap.dify.ai" rel="noopener noreferrer" target="_blank">
Product Roadmap
- </DropdownMenuLinkItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuLinkItem>
+ </MenuContent>
+ </Menu>
),
}
@@ -353,76 +348,76 @@ function ComplexDemo() {
const [showArchived, setShowArchived] = React.useState(false)
return (
- <DropdownMenu>
+ <Menu>
<TriggerButton label="Actions" />
- <DropdownMenuContent>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>Edit</DropdownMenuGroupLabel>
- <DropdownMenuItem>
+ <MenuContent>
+ <MenuGroup>
+ <MenuGroupLabel>Edit</MenuGroupLabel>
+ <MenuItem>
<span aria-hidden className="i-ri-pencil-line size-4 shrink-0 text-text-tertiary" />
Rename
- </DropdownMenuItem>
- <DropdownMenuItem>
+ </MenuItem>
+ <MenuItem>
<span aria-hidden className="i-ri-file-copy-line size-4 shrink-0 text-text-tertiary" />
Duplicate
- </DropdownMenuItem>
- <DropdownMenuItem disabled>
+ </MenuItem>
+ <MenuItem disabled>
<span aria-hidden className="i-ri-lock-line size-4 shrink-0 text-text-tertiary" />
Move to Workspace
- </DropdownMenuItem>
- </DropdownMenuGroup>
- <DropdownMenuSeparator />
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>
+ </MenuItem>
+ </MenuGroup>
+ <MenuSeparator />
+ <MenuSubmenu>
+ <MenuSubmenuTrigger>
<span aria-hidden className="i-ri-share-line size-4 shrink-0 text-text-tertiary" />
Share
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent>
- <DropdownMenuItem>
+ </MenuSubmenuTrigger>
+ <MenuContent>
+ <MenuItem>
<span aria-hidden className="i-ri-mail-line size-4 shrink-0 text-text-tertiary" />
Email
- </DropdownMenuItem>
- <DropdownMenuItem>
+ </MenuItem>
+ <MenuItem>
<span aria-hidden className="i-ri-chat-1-line size-4 shrink-0 text-text-tertiary" />
Slack
- </DropdownMenuItem>
- <DropdownMenuItem>
+ </MenuItem>
+ <MenuItem>
<span aria-hidden className="i-ri-link size-4 shrink-0 text-text-tertiary" />
Copy Link
- </DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- <DropdownMenuSeparator />
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>Sort by</DropdownMenuGroupLabel>
- <DropdownMenuRadioGroup<SortOrder> value={sortOrder} onValueChange={setSortOrder}>
- <DropdownMenuRadioItem<SortOrder> value="newest">
+ </MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ <MenuSeparator />
+ <MenuGroup>
+ <MenuGroupLabel>Sort by</MenuGroupLabel>
+ <MenuRadioGroup<SortOrder> value={sortOrder} onValueChange={setSortOrder}>
+ <MenuRadioItem<SortOrder> value="newest">
Newest first
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<SortOrder> value="oldest">
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ <MenuRadioItem<SortOrder> value="oldest">
Oldest first
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<SortOrder> value="name">
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ <MenuRadioItem<SortOrder> value="name">
Name
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- </DropdownMenuGroup>
- <DropdownMenuSeparator />
- <DropdownMenuCheckboxItem checked={showArchived} onCheckedChange={setShowArchived}>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ </MenuRadioGroup>
+ </MenuGroup>
+ <MenuSeparator />
+ <MenuCheckboxItem checked={showArchived} onCheckedChange={setShowArchived}>
<span aria-hidden className="i-ri-archive-line size-4 shrink-0 text-text-tertiary" />
Show Archived
- <DropdownMenuCheckboxItemIndicator />
- </DropdownMenuCheckboxItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem variant="destructive">
+ <MenuCheckboxItemIndicator />
+ </MenuCheckboxItem>
+ <MenuSeparator />
+ <MenuItem variant="destructive">
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
Delete
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)
}
@@ -431,29 +426,27 @@ export const Complex: Story = {
}
function DetachedTriggerDemo() {
- const [handle] = React.useState(() => createDropdownMenuHandle<{ name: string }>())
+ const [handle] = React.useState(() => createMenuHandle<{ name: string }>())
const [selected, setSelected] = React.useState('')
return (
<React.Fragment>
- <DropdownMenuTrigger
+ <MenuTrigger
handle={handle}
payload={{ name: 'Report' }}
className="rounded-lg border border-divider-subtle px-3 py-1.5"
>
Report actions
- </DropdownMenuTrigger>
- <DropdownMenu handle={handle}>
+ </MenuTrigger>
+ <Menu handle={handle}>
{({ payload }) => (
- <DropdownMenuContent>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>{payload?.name}</DropdownMenuGroupLabel>
- <DropdownMenuItem onClick={() => setSelected(payload?.name ?? '')}>
- Archive
- </DropdownMenuItem>
- </DropdownMenuGroup>
- </DropdownMenuContent>
+ <MenuContent>
+ <MenuGroup>
+ <MenuGroupLabel>{payload?.name}</MenuGroupLabel>
+ <MenuItem onClick={() => setSelected(payload?.name ?? '')}>Archive</MenuItem>
+ </MenuGroup>
+ </MenuContent>
)}
- </DropdownMenu>
+ </Menu>
<output aria-label="Archived document">{selected}</output>
</React.Fragment>
)
@@ -501,89 +494,86 @@ function FilterableDemo() {
return (
<div className="flex flex-col items-start gap-3">
- <DropdownMenuFilterProvider>
- <DropdownMenu>
+ <MenuFilterProvider>
+ <Menu>
<TriggerButton label="Workspace actions" />
- <DropdownMenuContent className="w-64">
- <DropdownMenuInputGroup>
+ <MenuContent className="w-64">
+ <MenuInputGroup>
<span
aria-hidden
className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
/>
- <DropdownMenuInput aria-label="Filter actions" placeholder="Filter actions…" />
- <DropdownMenuClear />
- </DropdownMenuInputGroup>
- <DropdownMenuEmpty>No actions match</DropdownMenuEmpty>
- <DropdownMenuList>
+ <MenuInput aria-label="Filter actions" placeholder="Filter actions…" />
+ <MenuClear />
+ </MenuInputGroup>
+ <MenuEmpty>No actions match</MenuEmpty>
+ <MenuList>
{filterableActionGroups.map((group, index) => (
- <DropdownMenuGroup key={group.label}>
- {index > 0 && <DropdownMenuSeparator />}
- <DropdownMenuGroupLabel>{group.label}</DropdownMenuGroupLabel>
+ <MenuGroup key={group.label}>
+ {index > 0 && <MenuSeparator />}
+ <MenuGroupLabel>{group.label}</MenuGroupLabel>
{group.actions.map((action) => (
- <DropdownMenuItem
+ <MenuItem
key={action}
variant={group.label === 'Danger zone' ? 'destructive' : 'default'}
onClick={() => setLastAction(action)}
>
{action}
- </DropdownMenuItem>
+ </MenuItem>
))}
{index === 0 && (
<React.Fragment>
{/* A submenu without its own provider stays unfiltered. */}
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Move to</DropdownMenuSubTrigger>
- <DropdownMenuSubContent>
- <DropdownMenuList>
+ <MenuSubmenu>
+ <MenuSubmenuTrigger>Move to</MenuSubmenuTrigger>
+ <MenuContent>
+ <MenuList>
{moveTargets.map((target) => (
- <DropdownMenuItem
+ <MenuItem
key={target}
onClick={() => setLastAction(`Move to ${target}`)}
>
{target}
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuList>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ </MenuList>
+ </MenuContent>
+ </MenuSubmenu>
{/* A submenu wrapped in its own provider filters with its own input. */}
- <DropdownMenuFilterProvider>
- <DropdownMenuSub>
- <DropdownMenuSubTrigger>Share with</DropdownMenuSubTrigger>
- <DropdownMenuSubContent>
- <DropdownMenuInputGroup>
+ <MenuFilterProvider>
+ <MenuSubmenu>
+ <MenuSubmenuTrigger>Share with</MenuSubmenuTrigger>
+ <MenuContent>
+ <MenuInputGroup>
<span
aria-hidden
className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
/>
- <DropdownMenuInput
- aria-label="Filter teams"
- placeholder="Filter teams…"
- />
- <DropdownMenuClear />
- </DropdownMenuInputGroup>
- <DropdownMenuEmpty>No teams match</DropdownMenuEmpty>
- <DropdownMenuList>
+ <MenuInput aria-label="Filter teams" placeholder="Filter teams…" />
+ <MenuClear />
+ </MenuInputGroup>
+ <MenuEmpty>No teams match</MenuEmpty>
+ <MenuList>
{shareTargets.map((target) => (
- <DropdownMenuItem
+ <MenuItem
key={target}
onClick={() => setLastAction(`Share with ${target}`)}
>
{target}
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuList>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- </DropdownMenuFilterProvider>
+ </MenuList>
+ </MenuContent>
+ </MenuSubmenu>
+ </MenuFilterProvider>
</React.Fragment>
)}
- </DropdownMenuGroup>
+ </MenuGroup>
))}
- </DropdownMenuList>
- </DropdownMenuContent>
- </DropdownMenu>
- </DropdownMenuFilterProvider>
+ </MenuList>
+ </MenuContent>
+ </Menu>
+ </MenuFilterProvider>
<p role="status" aria-label="Last action" className="system-xs-regular text-text-tertiary">
{lastAction ?? 'No action yet'}
</p>
@@ -597,7 +587,7 @@ export const Filterable: Story = {
story: { autoplay: false },
description: {
story:
- 'Filtering is a Base UI preview feature. Opening with a click or the keyboard focuses the input; opening on hover does not, so the on-screen keyboard stays hidden. Arrow keys move the highlight while the input keeps focus, Enter runs the highlighted action, Tab closes the menu, and Shift+Tab returns focus to the trigger. Groups without matches hide, and the empty state announces when nothing matches. Place the separator between groups inside the later group so it hides with the groups before it. A submenu trigger matches like an item; a submenu stays unfiltered unless its `DropdownMenuSub` is wrapped in its own `DropdownMenuFilterProvider` with its own input, as "Share with" is. In LTR, the right arrow opens a submenu and focuses its input when it has one, the left arrow closes it from an empty input and returns focus to the parent input, and each level keeps its own query. RTL reverses these horizontal keys. Pass `autoHighlight` to highlight the first match while typing.',
+ 'Filtering is a Base UI preview feature. Opening with a click or the keyboard focuses the input; opening on hover does not, so the on-screen keyboard stays hidden. Arrow keys move the highlight while the input keeps focus, Enter runs the highlighted action, Tab closes the menu, and Shift+Tab returns focus to the trigger. Groups without matches hide, and the empty state announces when nothing matches. Place the separator between groups inside the later group so it hides with the groups before it. A submenu trigger matches like an item; a submenu stays unfiltered unless its `MenuSubmenu` is wrapped in its own `MenuFilterProvider` with its own input, as "Share with" is. In LTR, the right arrow opens a submenu and focuses its input when it has one, the left arrow closes it from an empty input and returns focus to the parent input, and each level keeps its own query. RTL reverses these horizontal keys. Pass `autoHighlight` to highlight the first match while typing.',
},
},
},
diff --git a/packages/dify-ui/src/menu/index.tsx b/packages/dify-ui/src/menu/index.tsx
new file mode 100644
index 00000000000..befe37f8b6a
--- /dev/null
+++ b/packages/dify-ui/src/menu/index.tsx
@@ -0,0 +1,438 @@
+'use client'
+
+import type * as React from 'react'
+import type { InputGroupProps } from '../input-group'
+import type { MenuItemVariant as SharedMenuItemVariant } from '../internal/menu'
+import { Menu as BaseMenu } from '@base-ui/react/menu'
+import { cn } from '../cn'
+import { InputGroup } from '../input-group'
+import { focusRingClassName } from '../internal/focus'
+import { textControlGroupInputClassName } from '../internal/form-control'
+import {
+ menuItemClassName,
+ menuItemDestructiveClassName,
+ menuPopupBaseClassName,
+ menuPopupSurfaceClassName,
+} from '../internal/menu'
+import {
+ floatingGroupLabelClassName,
+ floatingItemIndicatorClassName,
+ floatingPopupAnimationClassName,
+ floatingSeparatorClassName,
+ positionerClassName,
+} from '../internal/overlay'
+import { resolveClassName } from '../internal/resolve-class-name'
+
+const Menu = BaseMenu.Root
+const MenuPortal = BaseMenu.Portal
+const MenuSubmenu = BaseMenu.SubmenuRoot
+const MenuGroup = BaseMenu.Group
+const createMenuHandle = BaseMenu.createHandle
+
+// A filterable menu hosts its input in `MenuInputGroup` and its items in `MenuList`,
+// so the list owns the `menu` role and the scrolling while the popup keeps its padding.
+const MenuFilterProvider = BaseMenu.FilterProvider
+const useMenuFilter = BaseMenu.useFilter
+
+type MenuHandle<Payload = unknown> = BaseMenu.Handle<Payload>
+
+type MenuActions = BaseMenu.Root.Actions
+type MenuChangeEventReason = BaseMenu.Root.ChangeEventReason
+type MenuChangeEventDetails = BaseMenu.Root.ChangeEventDetails
+type MenuHighlightEventReason = BaseMenu.Root.HighlightEventReason
+type MenuHighlightEventDetails = BaseMenu.Root.HighlightEventDetails
+
+type MenuProps<Payload = unknown> = BaseMenu.Root.Props<Payload>
+type MenuTriggerProps<Payload = unknown> = BaseMenu.Trigger.Props<Payload>
+
+function MenuTrigger<Payload = unknown>({ className, ...props }: MenuTriggerProps<Payload>) {
+ return (
+ <BaseMenu.Trigger
+ className={(state) => cn(focusRingClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
+type MenuPortalProps = BaseMenu.Portal.Props
+type MenuSubmenuProps = BaseMenu.SubmenuRoot.Props
+type MenuSubmenuChangeEventReason = BaseMenu.SubmenuRoot.ChangeEventReason
+type MenuSubmenuChangeEventDetails = BaseMenu.SubmenuRoot.ChangeEventDetails
+type MenuGroupProps = BaseMenu.Group.Props
+type MenuFilterProviderProps = BaseMenu.FilterProvider.Props
+type MenuFilterProviderChangeEventReason = BaseMenu.FilterProvider.ChangeEventReason
+type MenuFilterProviderChangeEventDetails = BaseMenu.FilterProvider.ChangeEventDetails
+
+type MenuInputGroupProps = InputGroupProps
+
+// A dify-ui composition over `InputGroup` with the menu's input and clear parts; it carries no Base
+// UI state attributes. Laid out like the Combobox popup search, with a minimum width because the
+// input has no intrinsic width and a menu popup is sized by its items. `InputGroup` owns the focus
+// ring; this group withholds it while the focused input lacks Base UI's `data-highlighted`, so the
+// ring shows while the input holds the keyboard highlight and gives way to the item highlight once
+// the arrow keys move into the list.
+function MenuInputGroup({ className, ...props }: MenuInputGroupProps) {
+ return (
+ <InputGroup
+ className={cn(
+ 'mx-1 mb-1 w-auto min-w-48 gap-0.5 px-2 has-[>input:focus:not([data-highlighted])]:ring-0',
+ className,
+ )}
+ {...props}
+ />
+ )
+}
+
+type MenuInputProps = BaseMenu.Input.Props
+
+// The group's padding and icon surround the input, so it keeps only a narrow inset.
+function MenuInput({ className, ...props }: MenuInputProps) {
+ return (
+ <BaseMenu.Input
+ className={(state) =>
+ cn(textControlGroupInputClassName, 'px-1', resolveClassName(className, state))
+ }
+ {...props}
+ />
+ )
+}
+
+type MenuClearProps = BaseMenu.Clear.Props
+
+// Base UI shows it only while the input has a value and keeps it out of the accessibility tree and
+// the tab order. Same look as `ComboboxClear`; change both together.
+function MenuClear({ className, children, ...props }: MenuClearProps) {
+ return (
+ <BaseMenu.Clear
+ className={(state) =>
+ cn(
+ 'flex size-5 shrink-0 items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-components-input-bg-hover hover:text-text-secondary',
+ resolveClassName(className, state),
+ )
+ }
+ {...props}
+ >
+ {children ?? <span className="i-ri-close-line size-4" aria-hidden="true" />}
+ </BaseMenu.Clear>
+ )
+}
+
+type MenuEmptyProps = BaseMenu.Empty.Props
+
+// Same look as `ComboboxEmpty`; change both together.
+function MenuEmpty({ className, ...props }: MenuEmptyProps) {
+ return (
+ <BaseMenu.Empty
+ className={(state) =>
+ cn('px-3 py-2 system-sm-regular text-text-tertiary', resolveClassName(className, state))
+ }
+ {...props}
+ />
+ )
+}
+
+type MenuListProps = BaseMenu.List.Props
+
+// The popup keeps its vertical padding and the items keep their inset, so the list adds none.
+// Filtering hides a group whose items all match out, so a separator between groups goes at the
+// start of the later group and shows only while a visible group precedes it. Every separator
+// directly inside a group follows that rule, so separate items with groups, not with a separator
+// among them. A separator placed directly in the list is not managed.
+function MenuList({ className, ...props }: MenuListProps) {
+ return (
+ <BaseMenu.List
+ className={(state) =>
+ cn(
+ 'max-h-80 min-h-0 overflow-x-hidden overflow-y-auto overscroll-contain outline-hidden',
+ '[&>:not([hidden])~[role=group]:not([hidden])>[role=separator]]:block [&>[role=group]>[role=separator]]:hidden',
+ resolveClassName(className, state),
+ )
+ }
+ {...props}
+ />
+ )
+}
+type MenuRadioGroupChangeEventReason = BaseMenu.RadioGroup.ChangeEventReason
+type MenuRadioGroupChangeEventDetails = BaseMenu.RadioGroup.ChangeEventDetails
+type MenuRadioGroupProps<Value = unknown> = Omit<
+ BaseMenu.RadioGroup.Props,
+ 'defaultValue' | 'onValueChange' | 'value'
+> & {
+ defaultValue?: Value
+ onValueChange?: (value: Value, eventDetails: MenuRadioGroupChangeEventDetails) => void
+ value?: Value
+}
+type MenuItemVariant = SharedMenuItemVariant
+
+function MenuRadioGroup<Value = unknown>(props: MenuRadioGroupProps<Value>): React.JSX.Element {
+ return <BaseMenu.RadioGroup {...props} />
+}
+
+type MenuRadioItemProps<Value = unknown> = Omit<BaseMenu.RadioItem.Props, 'value'> & {
+ value: Value
+}
+
+function MenuRadioItem<Value = unknown>({ className, ...props }: MenuRadioItemProps<Value>) {
+ return (
+ <BaseMenu.RadioItem
+ className={(state) => cn(menuItemClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
+
+function MenuRadioItemIndicator({ className, ...props }: MenuRadioItemIndicatorProps) {
+ return (
+ <BaseMenu.RadioItemIndicator
+ className={(state) => cn(floatingItemIndicatorClassName, resolveClassName(className, state))}
+ {...props}
+ >
+ <span aria-hidden className="i-ri-check-line h-4 w-4" />
+ </BaseMenu.RadioItemIndicator>
+ )
+}
+
+type MenuRadioItemIndicatorProps = Omit<BaseMenu.RadioItemIndicator.Props, 'children'>
+
+type MenuCheckboxItemProps = BaseMenu.CheckboxItem.Props
+type MenuCheckboxItemChangeEventReason = BaseMenu.CheckboxItem.ChangeEventReason
+type MenuCheckboxItemChangeEventDetails = BaseMenu.CheckboxItem.ChangeEventDetails
+
+function MenuCheckboxItem({ className, ...props }: MenuCheckboxItemProps) {
+ return (
+ <BaseMenu.CheckboxItem
+ className={(state) => cn(menuItemClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
+
+function MenuCheckboxItemIndicator({ className, ...props }: MenuCheckboxItemIndicatorProps) {
+ return (
+ <BaseMenu.CheckboxItemIndicator
+ className={(state) => cn(floatingItemIndicatorClassName, resolveClassName(className, state))}
+ {...props}
+ >
+ <span aria-hidden className="i-ri-check-line h-4 w-4" />
+ </BaseMenu.CheckboxItemIndicator>
+ )
+}
+
+type MenuCheckboxItemIndicatorProps = Omit<BaseMenu.CheckboxItemIndicator.Props, 'children'>
+
+type MenuGroupLabelProps = BaseMenu.GroupLabel.Props
+
+function MenuGroupLabel({ className, ...props }: MenuGroupLabelProps) {
+ return (
+ <BaseMenu.GroupLabel
+ className={(state) =>
+ cn(floatingGroupLabelClassName, 'px-3', resolveClassName(className, state))
+ }
+ {...props}
+ />
+ )
+}
+
+type MenuPositionerProps = BaseMenu.Positioner.Props
+
+function MenuPositioner({ className, ...props }: MenuPositionerProps) {
+ return (
+ <BaseMenu.Positioner
+ className={(state) => cn(positionerClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
+
+type MenuPopupProps = BaseMenu.Popup.Props
+
+// When a `MenuList` is rendered, Base UI hands the `menu` role to it and the popup becomes a
+// column that never scrolls itself, so the list scrolls and anything else in the popup stays put.
+function MenuPopup({ className, ...props }: MenuPopupProps) {
+ return (
+ <BaseMenu.Popup
+ className={(state) =>
+ cn(
+ menuPopupBaseClassName,
+ 'not-[[role=menu]]:flex not-[[role=menu]]:flex-col not-[[role=menu]]:overflow-hidden',
+ floatingPopupAnimationClassName,
+ resolveClassName(className, state),
+ )
+ }
+ {...props}
+ />
+ )
+}
+
+type MenuContentProps = Omit<MenuPopupProps, 'children'> &
+ Pick<MenuPositionerProps, 'side' | 'align' | 'alignOffset' | 'sideOffset'> & {
+ children: React.ReactNode
+ }
+
+function MenuContent({
+ children,
+ side,
+ align,
+ sideOffset = 4,
+ alignOffset,
+ className,
+ ...props
+}: MenuContentProps) {
+ return (
+ <MenuPortal>
+ <MenuPositioner side={side} align={align} sideOffset={sideOffset} alignOffset={alignOffset}>
+ <MenuPopup
+ className={(state) => cn(menuPopupSurfaceClassName, resolveClassName(className, state))}
+ {...props}
+ >
+ {children}
+ </MenuPopup>
+ </MenuPositioner>
+ </MenuPortal>
+ )
+}
+
+type MenuSubmenuTriggerProps = BaseMenu.SubmenuTrigger.Props & {
+ variant?: MenuItemVariant
+}
+
+function MenuSubmenuTrigger({
+ className,
+ variant = 'default',
+ children,
+ ...props
+}: MenuSubmenuTriggerProps) {
+ return (
+ <BaseMenu.SubmenuTrigger
+ data-variant={variant}
+ className={(state) =>
+ cn(menuItemClassName, menuItemDestructiveClassName, resolveClassName(className, state))
+ }
+ {...props}
+ >
+ {children}
+ <span
+ aria-hidden
+ className="ms-auto i-ri-arrow-right-s-line size-4 shrink-0 text-text-tertiary [&:dir(rtl)]:-scale-x-100"
+ />
+ </BaseMenu.SubmenuTrigger>
+ )
+}
+
+type MenuItemProps = BaseMenu.Item.Props & {
+ variant?: MenuItemVariant
+}
+
+function MenuItem({ className, variant = 'default', ...props }: MenuItemProps) {
+ return (
+ <BaseMenu.Item
+ data-variant={variant}
+ className={(state) =>
+ cn(menuItemClassName, menuItemDestructiveClassName, resolveClassName(className, state))
+ }
+ {...props}
+ />
+ )
+}
+
+type MenuLinkItemProps = BaseMenu.LinkItem.Props & {
+ variant?: MenuItemVariant
+}
+
+function MenuLinkItem({
+ className,
+ variant = 'default',
+ closeOnClick = true,
+ ...props
+}: MenuLinkItemProps) {
+ return (
+ <BaseMenu.LinkItem
+ data-variant={variant}
+ className={(state) =>
+ cn(menuItemClassName, menuItemDestructiveClassName, resolveClassName(className, state))
+ }
+ closeOnClick={closeOnClick}
+ {...props}
+ />
+ )
+}
+
+type MenuSeparatorProps = BaseMenu.Separator.Props
+
+function MenuSeparator({ className, ...props }: MenuSeparatorProps) {
+ return (
+ <BaseMenu.Separator
+ className={(state) => cn(floatingSeparatorClassName, resolveClassName(className, state))}
+ {...props}
+ />
+ )
+}
+
+export {
+ createMenuHandle,
+ Menu,
+ MenuCheckboxItem,
+ MenuCheckboxItemIndicator,
+ MenuClear,
+ MenuContent,
+ MenuEmpty,
+ MenuFilterProvider,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuInput,
+ MenuInputGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuList,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuSeparator,
+ MenuSubmenu,
+ MenuSubmenuTrigger,
+ MenuTrigger,
+ useMenuFilter,
+}
+
+export type {
+ MenuActions,
+ MenuChangeEventDetails,
+ MenuChangeEventReason,
+ MenuCheckboxItemChangeEventDetails,
+ MenuCheckboxItemChangeEventReason,
+ MenuCheckboxItemIndicatorProps,
+ MenuCheckboxItemProps,
+ MenuClearProps,
+ MenuContentProps,
+ MenuEmptyProps,
+ MenuFilterProviderChangeEventDetails,
+ MenuFilterProviderChangeEventReason,
+ MenuFilterProviderProps,
+ MenuGroupLabelProps,
+ MenuGroupProps,
+ MenuHandle,
+ MenuHighlightEventDetails,
+ MenuHighlightEventReason,
+ MenuInputGroupProps,
+ MenuInputProps,
+ MenuItemProps,
+ MenuLinkItemProps,
+ MenuListProps,
+ MenuPopupProps,
+ MenuPortalProps,
+ MenuPositionerProps,
+ MenuProps,
+ MenuRadioGroupChangeEventDetails,
+ MenuRadioGroupChangeEventReason,
+ MenuRadioGroupProps,
+ MenuRadioItemIndicatorProps,
+ MenuRadioItemProps,
+ MenuSeparatorProps,
+ MenuSubmenuChangeEventDetails,
+ MenuSubmenuChangeEventReason,
+ MenuSubmenuProps,
+ MenuSubmenuTriggerProps,
+ MenuTriggerProps,
+}
diff --git a/packages/dify-ui/src/popover/__tests__/index.spec.tsx b/packages/dify-ui/src/popover/__tests__/index.spec.tsx
index cc2ef9c2491..ef72c89b0ae 100644
--- a/packages/dify-ui/src/popover/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/popover/__tests__/index.spec.tsx
@@ -13,12 +13,7 @@ import {
PopoverTitle,
PopoverTrigger,
} from '..'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '../../dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '../../menu'
const renderWithSafeViewport = (ui: React.ReactNode) =>
render(<div style={{ minHeight: '100vh', minWidth: '100vw', padding: '240px' }}>{ui}</div>)
@@ -112,17 +107,17 @@ describe('Popover anatomy', () => {
it('places the backdrop above a parent menu and below the interactive popup', async () => {
const backdropRef = React.createRef<HTMLDivElement>()
const screen = await renderWithSafeViewport(
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger>Actions</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem>Primary action</DropdownMenuItem>
+ <Menu modal={false}>
+ <MenuTrigger>Actions</MenuTrigger>
+ <MenuContent>
+ <MenuItem>Primary action</MenuItem>
<Popover modal="trap-focus">
- <DropdownMenuItem
+ <MenuItem
closeOnClick={false}
render={<PopoverTrigger nativeButton={false} render={<div />} />}
>
More options
- </DropdownMenuItem>
+ </MenuItem>
<PopoverPortal>
<PopoverBackdrop ref={backdropRef} />
<PopoverPositioner side="right" align="start">
@@ -134,8 +129,8 @@ describe('Popover anatomy', () => {
</PopoverPositioner>
</PopoverPortal>
</Popover>
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuContent>
+ </Menu>,
)
await screen.getByRole('button', { name: 'Actions' }).click()
diff --git a/packages/tooling/lint.config.ts b/packages/tooling/lint.config.ts
index c4e48a228b1..4418b3afa65 100644
--- a/packages/tooling/lint.config.ts
+++ b/packages/tooling/lint.config.ts
@@ -284,7 +284,7 @@ export const stylingContractRules = {
},
{
pattern:
- '^(Input|Textarea|InputGroup|InputGroupInput|NumberFieldGroup|NumberFieldInput|ComboboxInputGroup|ComboboxInput|AutocompleteInputGroup|AutocompleteInput|DropdownMenuInputGroup|DropdownMenuInput)$',
+ '^(Input|Textarea|InputGroup|InputGroupInput|NumberFieldGroup|NumberFieldInput|ComboboxInputGroup|ComboboxInput|AutocompleteInputGroup|AutocompleteInput|MenuInputGroup|MenuInput)$',
allow: ['*'],
deny: focusIndicatorOverrides,
message:
diff --git a/packages/tooling/plugins/eslint/hint-content.test.ts b/packages/tooling/plugins/eslint/hint-content.test.ts
index 0744aff54b2..40de749d9d3 100644
--- a/packages/tooling/plugins/eslint/hint-content.test.ts
+++ b/packages/tooling/plugins/eslint/hint-content.test.ts
@@ -259,12 +259,12 @@ it('keeps focus styling owned by scroll areas, buttons and visible input surface
import { Input } from '@langgenius/dify-ui/input'
import { InputGroup, InputGroupInput } from '@langgenius/dify-ui/input-group'
import { Textarea } from '@langgenius/dify-ui/textarea'
- import { DropdownMenuTrigger } from '@langgenius/dify-ui/dropdown-menu'
+ import { MenuTrigger } from '@langgenius/dify-ui/menu'
const examples = <>
<ScrollArea className="rounded-lg ring-2" />
<Viewport className="focus-visible:ring-2 dark:focus-visible:ring-red-500! outline-hidden focus-visible:inset-ring-2" />
<Button className="focus-visible:ring-0 focus-visible:inset-ring-0" />
- <DropdownMenuTrigger render={<IconButton aria-label="Open" />} className="focus-visible:outline-2" />
+ <MenuTrigger render={<IconButton aria-label="Open" />} className="focus-visible:outline-2" />
<Input className="focus:ring-0" />
<InputGroup className="has-[>input:focus]:ring-2" />
<InputGroupInput className="focus-visible:ring-2" />
diff --git a/web/__tests__/interactive-component-mock-boundary.spec.ts b/web/__tests__/interactive-component-mock-boundary.spec.ts
index 2fdc02738cb..7e67bfb3235 100644
--- a/web/__tests__/interactive-component-mock-boundary.spec.ts
+++ b/web/__tests__/interactive-component-mock-boundary.spec.ts
@@ -3,7 +3,7 @@ import { relative, resolve } from 'node:path'
const testFilePattern = /\.(?:spec|test)\.[cm]?[jt]sx?$/
const interactivePrimitiveMockPattern =
- /vi\.mock\(\s*['"]@langgenius\/dify-ui\/(?:alert-dialog|avatar|button|dialog|dropdown-menu|pagination|popover|select|slider|switch|textarea|tooltip)['"]/
+ /vi\.mock\(\s*['"]@langgenius\/dify-ui\/(?:alert-dialog|avatar|button|dialog|menu|pagination|popover|select|slider|switch|textarea|tooltip)['"]/
const interactiveWrapperMockPattern =
/vi\.mock\(\s*['"][^'"]*(?:block-selector|plugin-version-picker|time-picker|prompt-editor)(?:\/index)?['"]/
diff --git a/web/app/account/(commonLayout)/avatar.tsx b/web/app/account/(commonLayout)/avatar.tsx
index c4c371f2a93..5119b730a9c 100644
--- a/web/app/account/(commonLayout)/avatar.tsx
+++ b/web/app/account/(commonLayout)/avatar.tsx
@@ -1,12 +1,7 @@
'use client'
import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next'
import PremiumBadge from '@/app/components/base/premium-badge'
@@ -37,8 +32,8 @@ export default function AppSelector() {
if (!userProfile) return null
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={userProfile.name}
className={cn(
'inline-flex size-8 items-center justify-center rounded-full border-none bg-transparent p-0 text-sm text-text-primary',
@@ -49,8 +44,8 @@ export default function AppSelector() {
<AvatarFallback>{getAvatarInitial(userProfile.name)}</AvatarFallback>
<AvatarImage src={userProfile.avatar_url || undefined} alt="" />
</Avatar>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-60 max-w-80 divide-y divide-divider-subtle bg-components-panel-bg-blur p-0">
+ </MenuTrigger>
+ <MenuContent className="w-60 max-w-80 divide-y divide-divider-subtle bg-components-panel-bg-blur p-0">
<div className="p-1">
<div className="flex flex-nowrap items-center px-3 py-2">
<div className="min-w-0 grow">
@@ -74,7 +69,7 @@ export default function AppSelector() {
</div>
</div>
<div className="p-1">
- <DropdownMenuItem className="h-9 justify-start px-3" onClick={() => logout()}>
+ <MenuItem className="h-9 justify-start px-3" onClick={() => logout()}>
<span
aria-hidden="true"
className="mr-1 i-custom-vender-line-general-log-out-01 flex size-4 text-text-tertiary"
@@ -82,9 +77,9 @@ export default function AppSelector() {
<span className="text-[14px] font-normal text-text-secondary">
{t(($) => $['userProfile.logout'], { ns: 'common' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
</div>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/access-rules-editor/add-access-subject-menu.tsx b/web/app/components/access-rules-editor/add-access-subject-menu.tsx
index 6e59eb2811a..5f7236d8ee2 100644
--- a/web/app/components/access-rules-editor/add-access-subject-menu.tsx
+++ b/web/app/components/access-rules-editor/add-access-subject-menu.tsx
@@ -4,16 +4,16 @@ import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuEmpty,
- DropdownMenuFilterProvider,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuItem,
- DropdownMenuList,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuEmpty,
+ MenuFilterProvider,
+ MenuInput,
+ MenuInputGroup,
+ MenuItem,
+ MenuList,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useQuery } from '@tanstack/react-query'
import { memo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -56,16 +56,16 @@ function AddAccessSubjectMenuContent({
return (
<>
- <DropdownMenuInputGroup>
+ <MenuInputGroup>
<span
aria-hidden="true"
className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
/>
- <DropdownMenuInput
+ <MenuInput
aria-label={t(($) => $['operation.search'], { ns: 'common' })}
placeholder={t(($) => $['placeholder.search'], { ns: 'common' })}
/>
- </DropdownMenuInputGroup>
+ </MenuInputGroup>
{error && (
<div role="alert" className="px-3 py-2 system-sm-regular text-text-tertiary">
{t(($) => $['api.actionFailed'], { ns: 'common' })}
@@ -73,19 +73,17 @@ function AddAccessSubjectMenuContent({
)}
{isLoading && <LoadingPlaceholder className="h-20 p-1" />}
{!isLoading && !error && (
- <DropdownMenuEmpty>
- {t(($) => $['accessRule.noAvailableMembers'], { ns: 'permission' })}
- </DropdownMenuEmpty>
+ <MenuEmpty>{t(($) => $['accessRule.noAvailableMembers'], { ns: 'permission' })}</MenuEmpty>
)}
{/* ARIA requires a `menu` that has no items yet because they are loading to be marked busy. */}
- <DropdownMenuList aria-busy={isLoading || undefined}>
+ <MenuList aria-busy={isLoading || undefined}>
{members.map((member) => {
const isAdded = existingAccountIdSet.has(member.id)
const isUpdating = updatingAccountId === member.id
const memberName = member.name || member.email
return (
- <DropdownMenuItem
+ <MenuItem
key={member.id}
// The query matches the name and email, not the row's action text.
label={`${member.name || ''} ${member.email || ''}`}
@@ -119,10 +117,10 @@ function AddAccessSubjectMenuContent({
) : (
<span className="shrink-0 system-xs-medium text-text-accent">{`+ ${addLabel}`}</span>
)}
- </DropdownMenuItem>
+ </MenuItem>
)
})}
- </DropdownMenuList>
+ </MenuList>
</>
)
}
@@ -137,9 +135,9 @@ function AddAccessSubjectMenu({
const isLoadingExisting = existingAccountIds === undefined
return (
- <DropdownMenuFilterProvider>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <MenuFilterProvider>
+ <Menu>
+ <MenuTrigger
disabled={disabled}
render={
<Button
@@ -152,8 +150,8 @@ function AddAccessSubjectMenu({
>
<span className="i-ri-add-line size-3.5" aria-hidden />
<span>{t(($) => $['operation.add'], { ns: 'common' })}</span>
- </DropdownMenuTrigger>
- <DropdownMenuContent
+ </MenuTrigger>
+ <MenuContent
sideOffset={8}
aria-label={t(($) => $['accessRule.addMembersTitle'], { ns: 'permission' })}
className="w-86 max-w-[calc(100vw-32px)]"
@@ -165,9 +163,9 @@ function AddAccessSubjectMenu({
onAddAccessSubject={onAddAccessSubject}
/>
)}
- </DropdownMenuContent>
- </DropdownMenu>
- </DropdownMenuFilterProvider>
+ </MenuContent>
+ </Menu>
+ </MenuFilterProvider>
)
}
diff --git a/web/app/components/app-sidebar/app-info/app-operations.tsx b/web/app/components/app-sidebar/app-info/app-operations.tsx
index df6bff53cca..e02151574c7 100644
--- a/web/app/components/app-sidebar/app-info/app-operations.tsx
+++ b/web/app/components/app-sidebar/app-info/app-operations.tsx
@@ -1,13 +1,13 @@
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Fragment } from 'react'
import { useTranslation } from 'react-i18next'
@@ -31,8 +31,8 @@ const AppOperations = ({ appName, operationGroups }: AppOperationsProps) => {
const visibleGroups = operationGroups.filter((group) => group.length > 0)
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
disabled={!visibleGroups.length}
render={
<IconButton
@@ -47,13 +47,13 @@ const AppOperations = ({ appName, operationGroups }: AppOperationsProps) => {
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-40">
+ <MenuContent align="end" className="min-w-40">
{visibleGroups.map((group, groupIndex) => (
<Fragment key={group.map((operation) => operation.id).join('-')}>
- {groupIndex > 0 && <DropdownMenuSeparator />}
- <DropdownMenuGroup>
+ {groupIndex > 0 && <MenuSeparator />}
+ <MenuGroup>
{group.map((operation) => (
- <DropdownMenuItem
+ <MenuItem
key={operation.id}
variant={operation.variant}
className="gap-2 px-3"
@@ -85,13 +85,13 @@ const AppOperations = ({ appName, operationGroups }: AppOperationsProps) => {
>
{operation.title}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuGroup>
+ </MenuGroup>
</Fragment>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx b/web/app/components/app-sidebar/dataset-info/__tests__/actions-menu-callbacks.spec.tsx
similarity index 96%
rename from web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx
rename to web/app/components/app-sidebar/dataset-info/__tests__/actions-menu-callbacks.spec.tsx
index 018dcdfd72d..9b21b67ee60 100644
--- a/web/app/components/app-sidebar/dataset-info/__tests__/dropdown-callbacks.spec.tsx
+++ b/web/app/components/app-sidebar/dataset-info/__tests__/actions-menu-callbacks.spec.tsx
@@ -11,7 +11,7 @@ import { createDeferred } from '@/test/deferred'
import { createDatasetFixture } from '@/test/fixtures/dataset'
import { RETRIEVE_METHOD } from '@/types/app'
import { DatasetACLPermission } from '@/utils/permission'
-import Dropdown from '../dropdown'
+import ActionsMenu from '../actions-menu'
let mockDataset: DatasetDetailWithPartialMembersResponse
const mockReplace = vi.fn()
@@ -137,7 +137,7 @@ vi.mock('@/app/notifications', () => ({
},
}))
-describe('Dropdown callback coverage', () => {
+describe('ActionsMenu callback coverage', () => {
beforeEach(() => {
vi.clearAllMocks()
mockIsRbacEnabled = true
@@ -150,7 +150,7 @@ describe('Dropdown callback coverage', () => {
it('should call refreshDataset when rename succeeds', async () => {
const user = userEvent.setup()
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('common.operation.edit'))
@@ -175,7 +175,7 @@ describe('Dropdown callback coverage', () => {
it('should close rename modal when onClose is called', async () => {
const user = userEvent.setup()
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('common.operation.edit'))
@@ -192,7 +192,7 @@ describe('Dropdown callback coverage', () => {
it('should close confirm dialog when cancel is clicked', async () => {
const user = userEvent.setup()
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('common.operation.delete'))
@@ -212,7 +212,7 @@ describe('Dropdown callback coverage', () => {
const user = userEvent.setup()
const pending = createDeferred<void>()
mockDeleteDataset.mockReturnValueOnce(pending.promise)
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('common.operation.delete'))
@@ -232,7 +232,7 @@ describe('Dropdown callback coverage', () => {
const user = userEvent.setup()
mockCheckIsUsedInApp.mockResolvedValueOnce({ is_using: true })
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('common.operation.delete'))
@@ -246,7 +246,7 @@ describe('Dropdown callback coverage', () => {
const user = userEvent.setup()
mockExportPipeline.mockRejectedValueOnce(new Error('export failed'))
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('datasetPipeline.operations.exportPipeline'))
@@ -260,7 +260,7 @@ describe('Dropdown callback coverage', () => {
const user = userEvent.setup()
mockDataset = createDataset({ pipeline_id: '' })
- render(<Dropdown expand={false} />)
+ render(<ActionsMenu expand={false} />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('datasetPipeline.operations.exportPipeline'))
@@ -274,7 +274,7 @@ describe('Dropdown callback coverage', () => {
createHttpError(new Response(null, { status: 400 }), { message: 'check failed' }),
)
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
await user.click(screen.getByRole('button'))
await user.click(screen.getByText('common.operation.delete'))
diff --git a/web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx b/web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx
index d407fb89a16..166f630f233 100644
--- a/web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx
+++ b/web/app/components/app-sidebar/dataset-info/__tests__/index.spec.tsx
@@ -11,7 +11,7 @@ import { createDatasetFixture } from '@/test/fixtures/dataset'
import { RETRIEVE_METHOD } from '@/types/app'
import { DatasetACLPermission } from '@/utils/permission'
import DatasetInfo from '..'
-import Dropdown from '../dropdown'
+import ActionsMenu from '../actions-menu'
let mockDataset: ReturnType<typeof createDatasetFixture>
const mockPush = vi.fn()
@@ -193,7 +193,7 @@ describe('DatasetInfo', () => {
})
})
-describe('Dropdown', () => {
+describe('ActionsMenu', () => {
beforeEach(() => {
vi.clearAllMocks()
mockDataset = createDataset({ pipeline_id: 'pipeline-1', runtime_mode: 'rag_pipeline' })
@@ -226,7 +226,7 @@ describe('Dropdown', () => {
runtime_mode: 'rag_pipeline',
permission_keys: [DatasetACLPermission.Edit, DatasetACLPermission.ImportExportDSL],
})
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
// Act
await openMenu(user)
@@ -242,7 +242,7 @@ describe('Dropdown', () => {
runtime_mode: 'general',
permission_keys: [DatasetACLPermission.AccessConfig],
})
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
// Act
await openMenu(user)
@@ -261,7 +261,7 @@ describe('Dropdown', () => {
runtime_mode: 'general',
permission_keys: [DatasetACLPermission.AccessConfig, DatasetACLPermission.Delete],
})
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
// Act
await openMenu(user)
@@ -277,7 +277,7 @@ describe('Dropdown', () => {
it('renames the dataset and invalidates cached list and detail', async () => {
const user = userEvent.setup()
// Arrange
- const { queryClient } = render(<Dropdown expand />)
+ const { queryClient } = render(<ActionsMenu expand />)
// Act
await openMenu(user)
@@ -312,7 +312,7 @@ describe('Dropdown', () => {
.mockReturnValue('blob:pipeline-export')
const revokeObjectURLSpy = vi.spyOn(URL, 'revokeObjectURL')
// Arrange
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
// Act
await openMenu(user)
@@ -333,7 +333,7 @@ describe('Dropdown', () => {
it('should delete dataset and redirect when confirm is clicked', async () => {
const user = userEvent.setup()
// Arrange
- const { queryClient } = render(<Dropdown expand />)
+ const { queryClient } = render(<ActionsMenu expand />)
// Act
await openMenu(user)
@@ -356,7 +356,7 @@ describe('Dropdown', () => {
runtime_mode: 'general',
permission_keys: [DatasetACLPermission.AccessConfig],
})
- render(<Dropdown expand />)
+ render(<ActionsMenu expand />)
// Act
await openMenu(user)
diff --git a/web/app/components/app-sidebar/dataset-info/dropdown.tsx b/web/app/components/app-sidebar/dataset-info/actions-menu.tsx
similarity index 90%
rename from web/app/components/app-sidebar/dataset-info/dropdown.tsx
rename to web/app/components/app-sidebar/dataset-info/actions-menu.tsx
index d4808e80d1a..50acac51bd7 100644
--- a/web/app/components/app-sidebar/dataset-info/dropdown.tsx
+++ b/web/app/components/app-sidebar/dataset-info/actions-menu.tsx
@@ -1,14 +1,8 @@
import type { DatasetDetailWithPartialMembersResponse } from '@dify/contracts/api/console/datasets/types.gen'
import { AlertDialog, AlertDialogContent } from '@langgenius/dify-ui/alert-dialog'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation, useQueryClient, useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import * as React from 'react'
@@ -118,8 +112,8 @@ const DropDown = ({ expand, triggerClassName }: DropDownProps) => {
if (!canShowOperations) return null
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -130,39 +124,39 @@ const DropDown = ({ expand, triggerClassName }: DropDownProps) => {
</IconButton>
}
/>
- <DropdownMenuContent
+ <MenuContent
side={expand ? 'bottom' : 'right'}
align={expand ? 'end' : 'start'}
className="w-50"
>
{datasetACLCapabilities.canEdit && (
- <DropdownMenuItem onClick={() => setRenameOpen(true)}>
+ <MenuItem onClick={() => setRenameOpen(true)}>
<span aria-hidden className="i-ri-edit-line size-4 text-text-tertiary" />
{t(($) => $['operation.edit'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{datasetACLCapabilities.canImportExportDSL && dataset.runtime_mode === 'rag_pipeline' && (
- <DropdownMenuItem onClick={() => void handleExportPipeline()}>
+ <MenuItem onClick={() => void handleExportPipeline()}>
<span aria-hidden className="i-ri-file-download-line size-4 text-text-tertiary" />
{t(($) => $['operations.exportPipeline'], { ns: 'datasetPipeline' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{datasetACLCapabilities.canAccessConfig && (
- <DropdownMenuItem onClick={openAccessConfig}>
+ <MenuItem onClick={openAccessConfig}>
<span aria-hidden className="i-ri-lock-2-line size-4 text-text-tertiary" />
{t(($) => $['settings.resourceAccess'], { ns: 'navigation' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{datasetACLCapabilities.canDelete && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem variant="destructive" onClick={() => setDeleteOpen(true)}>
+ <MenuSeparator />
+ <MenuItem variant="destructive" onClick={() => setDeleteOpen(true)}>
<span aria-hidden className="i-ri-delete-bin-line size-4 text-text-tertiary" />
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
+ </MenuContent>
<RenameDatasetModal
open={renameOpen}
dataset={dataset}
@@ -202,7 +196,7 @@ const DropDown = ({ expand, triggerClassName }: DropDownProps) => {
/>
</AlertDialogContent>
</AlertDialog>
- </DropdownMenu>
+ </Menu>
)
}
diff --git a/web/app/components/app-sidebar/dataset-info/index.tsx b/web/app/components/app-sidebar/dataset-info/index.tsx
index a7d3763dbe9..c3f234c8667 100644
--- a/web/app/components/app-sidebar/dataset-info/index.tsx
+++ b/web/app/components/app-sidebar/dataset-info/index.tsx
@@ -8,7 +8,7 @@ import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
import { useKnowledge } from '@/hooks/use-knowledge'
import { DOC_FORM_TEXT } from '@/models/datasets'
import AppIcon from '../../base/app-icon'
-import Dropdown from './dropdown'
+import ActionsMenu from './actions-menu'
type DatasetInfoProps = {
expand: boolean
@@ -78,7 +78,7 @@ const DatasetInfo = ({ expand }: DatasetInfoProps) => {
</div>
</div>
<div className="flex size-8 shrink-0 items-center justify-center">
- <Dropdown expand />
+ <ActionsMenu expand />
</div>
</>
)}
diff --git a/web/app/components/app-sidebar/snippet-info/__tests__/dropdown.spec.tsx b/web/app/components/app-sidebar/snippet-info/__tests__/actions-menu.spec.tsx
similarity index 93%
rename from web/app/components/app-sidebar/snippet-info/__tests__/dropdown.spec.tsx
rename to web/app/components/app-sidebar/snippet-info/__tests__/actions-menu.spec.tsx
index 9a975d8071a..58ab573f0b2 100644
--- a/web/app/components/app-sidebar/snippet-info/__tests__/dropdown.spec.tsx
+++ b/web/app/components/app-sidebar/snippet-info/__tests__/actions-menu.spec.tsx
@@ -2,7 +2,7 @@ import type { SnippetDetail } from '@/models/snippet'
import { screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { renderWithConsoleQuery } from '@/test/console/query-data'
-import SnippetInfoDropdown from '../dropdown'
+import SnippetInfoMenu from '../actions-menu'
const mockReplace = vi.fn()
const mockDownloadBlob = vi.fn()
@@ -58,7 +58,7 @@ vi.mock('@/service/console', async (importOriginal) => {
}
})
-describe('SnippetInfoDropdown', () => {
+describe('SnippetInfoMenu', () => {
beforeEach(() => {
vi.clearAllMocks()
mockWorkspacePermissionKeys = ['snippets.create_and_modify', 'snippets.management']
@@ -69,7 +69,7 @@ describe('SnippetInfoDropdown', () => {
it('should render nothing without snippet create or management permission', () => {
mockWorkspacePermissionKeys = []
- render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ render(<SnippetInfoMenu snippet={mockSnippet} />)
expect(screen.queryByRole('button')).not.toBeInTheDocument()
})
@@ -78,7 +78,7 @@ describe('SnippetInfoDropdown', () => {
const user = userEvent.setup()
mockWorkspacePermissionKeys = ['snippets.create_and_modify']
- const { unmount } = render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ const { unmount } = render(<SnippetInfoMenu snippet={mockSnippet} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
expect(screen.getByText('snippet.menu.editInfo')).toBeInTheDocument()
@@ -87,7 +87,7 @@ describe('SnippetInfoDropdown', () => {
unmount()
mockWorkspacePermissionKeys = ['snippets.management']
- render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ render(<SnippetInfoMenu snippet={mockSnippet} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
expect(screen.queryByText('snippet.menu.editInfo')).not.toBeInTheDocument()
@@ -102,7 +102,7 @@ describe('SnippetInfoDropdown', () => {
const user = userEvent.setup()
mockUpdateMutate.mockResolvedValue({})
- render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ render(<SnippetInfoMenu snippet={mockSnippet} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByText('snippet.menu.editInfo'))
@@ -132,7 +132,7 @@ describe('SnippetInfoDropdown', () => {
mockWorkspacePermissionKeys = ['snippets.create_and_modify']
mockExportMutateAsync.mockResolvedValue('yaml: content')
- render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ render(<SnippetInfoMenu snippet={mockSnippet} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByText('snippet.menu.exportSnippet'))
@@ -157,7 +157,7 @@ describe('SnippetInfoDropdown', () => {
mockWorkspacePermissionKeys = ['snippets.create_and_modify']
mockExportMutateAsync.mockRejectedValue(new Error('export failed'))
- render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ render(<SnippetInfoMenu snippet={mockSnippet} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByText('snippet.menu.exportSnippet'))
@@ -174,7 +174,7 @@ describe('SnippetInfoDropdown', () => {
const user = userEvent.setup()
mockDeleteMutate.mockResolvedValue({})
- render(<SnippetInfoDropdown snippet={mockSnippet} />)
+ render(<SnippetInfoMenu snippet={mockSnippet} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByText('snippet.menu.deleteSnippet'))
diff --git a/web/app/components/app-sidebar/snippet-info/dropdown.tsx b/web/app/components/app-sidebar/snippet-info/actions-menu.tsx
similarity index 86%
rename from web/app/components/app-sidebar/snippet-info/dropdown.tsx
rename to web/app/components/app-sidebar/snippet-info/actions-menu.tsx
index 61c99d8daa7..b047ab62ea2 100644
--- a/web/app/components/app-sidebar/snippet-info/dropdown.tsx
+++ b/web/app/components/app-sidebar/snippet-info/actions-menu.tsx
@@ -11,14 +11,8 @@ import {
AlertDialogHeader,
AlertDialogTitle,
} from '@langgenius/dify-ui/alert-dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useAtomValue } from 'jotai'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
@@ -37,11 +31,11 @@ import {
} from '@/service/use-snippets'
import { downloadBlob } from '@/utils/download'
-type SnippetInfoDropdownProps = {
+type SnippetInfoMenuProps = {
snippet: SnippetDetail
}
-const SnippetInfoDropdown = ({ snippet }: SnippetInfoDropdownProps) => {
+const SnippetInfoMenu = ({ snippet }: SnippetInfoMenuProps) => {
const { t } = useTranslation(['snippet', 'common'])
const { replace } = useRouter()
const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)
@@ -123,8 +117,8 @@ const SnippetInfoDropdown = ({ snippet }: SnippetInfoDropdownProps) => {
return (
<>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -134,39 +128,37 @@ const SnippetInfoDropdown = ({ snippet }: SnippetInfoDropdownProps) => {
</IconButton>
}
/>
- <DropdownMenuContent className="w-45 p-1">
+ <MenuContent align="end" className="w-45">
{canCreateAndModifySnippet && (
<>
- <DropdownMenuItem className="mx-0 gap-2" onClick={handleOpenEditDialog}>
+ <MenuItem className="gap-2" onClick={handleOpenEditDialog}>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-tertiary" />
<span className="grow">{t(($) => $['menu.editInfo'])}</span>
- </DropdownMenuItem>
- <DropdownMenuItem className="mx-0 gap-2" onClick={handleExportSnippet}>
+ </MenuItem>
+ <MenuItem className="gap-2" onClick={handleExportSnippet}>
<span
aria-hidden
className="i-ri-download-2-line size-4 shrink-0 text-text-tertiary"
/>
<span className="grow">{t(($) => $['menu.exportSnippet'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
{canManageSnippet && (
<>
- {canCreateAndModifySnippet && (
- <DropdownMenuSeparator className="my-1! bg-divider-subtle" />
- )}
- <DropdownMenuItem
- className="mx-0 gap-2"
+ {canCreateAndModifySnippet && <MenuSeparator className="my-1! bg-divider-subtle" />}
+ <MenuItem
+ className="gap-2"
variant="destructive"
onClick={() => setIsDeleteDialogOpen(true)}
>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span className="grow">{t(($) => $['menu.deleteSnippet'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
{isEditDialogOpen && (
<CreateSnippetDialog
@@ -203,4 +195,4 @@ const SnippetInfoDropdown = ({ snippet }: SnippetInfoDropdownProps) => {
)
}
-export default React.memo(SnippetInfoDropdown)
+export default React.memo(SnippetInfoMenu)
diff --git a/web/app/components/app/annotation/header-opts/index.tsx b/web/app/components/app/annotation/header-opts/index.tsx
index b62ba5f92ea..af8fa9951e6 100644
--- a/web/app/components/app/annotation/header-opts/index.tsx
+++ b/web/app/components/app/annotation/header-opts/index.tsx
@@ -5,14 +5,13 @@ import type { AnnotationItemBasic } from '../type'
import { AlertDialog } from '@langgenius/dify-ui/alert-dialog'
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuItem,
+ MenuSubmenu,
+ MenuSubmenuTrigger,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useMutation } from '@tanstack/react-query'
import * as React from 'react'
import { useEffect, useState } from 'react'
@@ -75,7 +74,7 @@ const OperationsMenu: FC<OperationsMenuProps> = ({
return (
<>
- <DropdownMenuItem
+ <MenuItem
className="gap-2"
onClick={() => {
onBulkImport()
@@ -86,35 +85,35 @@ const OperationsMenu: FC<OperationsMenuProps> = ({
className="i-custom-vender-line-files-file-plus-02 size-4 shrink-0 text-text-tertiary"
/>
{t(($) => $['table.header.bulkImport'], { ns: 'appAnnotation' })}
- </DropdownMenuItem>
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="gap-2">
+ </MenuItem>
+ <MenuSubmenu>
+ <MenuSubmenuTrigger className="gap-2">
<span
aria-hidden
className="i-custom-vender-line-files-file-download-02 size-4 shrink-0 text-text-tertiary"
/>
{t(($) => $['table.header.bulkExport'], { ns: 'appAnnotation' })}
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent side="left" className="min-w-25">
- <DropdownMenuItem
+ </MenuSubmenuTrigger>
+ <MenuContent side="left" className="min-w-25">
+ <MenuItem
disabled={annotationUnavailable}
onClick={() => {
downloadAnnotationCsv(list, locale)
}}
>
CSV
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
disabled={annotationUnavailable}
onClick={() => {
onExportJsonl()
}}
>
JSONL
- </DropdownMenuItem>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- <DropdownMenuItem
+ </MenuItem>
+ </MenuContent>
+ </MenuSubmenu>
+ <MenuItem
variant="destructive"
className="gap-2"
onClick={() => {
@@ -123,7 +122,7 @@ const OperationsMenu: FC<OperationsMenuProps> = ({
>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
{t(($) => $['table.header.clearAll'], { ns: 'appAnnotation' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)
}
@@ -174,22 +173,22 @@ const HeaderOptions: FC<Props> = ({ appId, onAdd, onAdded, controlUpdateList })
<span aria-hidden className="i-ri-add-line size-4" />
<div>{t(($) => $['table.header.addAnnotation'], { ns: 'appAnnotation' })}</div>
</Button>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
className="mr-0 box-border inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-0 text-components-button-secondary-text shadow-xs backdrop-blur-[5px] hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover data-popup-open:border-components-button-secondary-border-hover data-popup-open:bg-components-button-secondary-bg-hover"
>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-38.75">
+ </MenuTrigger>
+ <MenuContent align="end" className="w-38.75">
<OperationsMenu
list={list}
onBulkImport={handleShowBulkImportModal}
onClearAll={handleClearAll}
onExportJsonl={handleExportJsonl}
/>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
{showAddModal && (
<AddAnnotationModal
isShow={showAddModal}
diff --git a/web/app/components/app/app-publisher/environment-tabs/index.tsx b/web/app/components/app/app-publisher/environment-tabs/index.tsx
index 3ba5ae27667..2ef02ee22c3 100644
--- a/web/app/components/app/app-publisher/environment-tabs/index.tsx
+++ b/web/app/components/app/app-publisher/environment-tabs/index.tsx
@@ -3,14 +3,14 @@
import type { PublisherEnvironment, PublisherEnvironmentTabsProps } from './types'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { useTranslation } from 'react-i18next'
import { BUILT_IN_ENVIRONMENT_ID } from '../state'
@@ -33,12 +33,12 @@ function EnvironmentMenuItem({
onClick: () => void
}) {
return (
- <DropdownMenuItem className="mx-0 gap-2 py-1.5" onClick={onClick}>
+ <MenuItem className="gap-2 py-1.5" onClick={onClick}>
<span aria-hidden className="i-ri-instance-line size-4 shrink-0 text-text-tertiary" />
<span className="grow truncate system-md-regular text-text-secondary">
{environment.name}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -143,8 +143,8 @@ export function PublisherEnvironmentTabs({
})}
</div>
{layout.showMore && (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<button
type="button"
@@ -167,9 +167,9 @@ export function PublisherEnvironmentTabs({
</button>
}
/>
- <DropdownMenuContent className="w-42 p-0">
+ <MenuContent className="w-42 p-0">
{overflowEnvironments.length > 0 && (
- <DropdownMenuGroup className="p-1">
+ <MenuGroup className="py-1">
{overflowEnvironments.map((environment) => (
<EnvironmentMenuItem
key={environment.id}
@@ -177,16 +177,16 @@ export function PublisherEnvironmentTabs({
onClick={() => onSelectEnvironment(environment.id)}
/>
))}
- </DropdownMenuGroup>
+ </MenuGroup>
)}
{overflowEnvironments.length > 0 && undeployedEnvironments.length > 0 && (
- <DropdownMenuSeparator className="my-0" />
+ <MenuSeparator className="my-0" />
)}
{undeployedEnvironments.length > 0 && (
- <DropdownMenuGroup className="p-1">
- <DropdownMenuGroupLabel className="px-2 py-1">
+ <MenuGroup className="py-1">
+ <MenuGroupLabel className="py-1">
{t(($) => $['card.notDeployed'], { ns: 'deployments' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{undeployedEnvironments.map((environment) => (
<EnvironmentMenuItem
key={environment.id}
@@ -194,10 +194,10 @@ export function PublisherEnvironmentTabs({
onClick={() => onAddEnvironment(environment.id)}
/>
))}
- </DropdownMenuGroup>
+ </MenuGroup>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)}
<EnvironmentTabsMeasurementProbe
diff --git a/web/app/components/app/app-publisher/publish-with-multiple-model.tsx b/web/app/components/app/app-publisher/publish-with-multiple-model.tsx
index 0b5f8336c1a..9d88737733b 100644
--- a/web/app/components/app/app-publisher/publish-with-multiple-model.tsx
+++ b/web/app/components/app/app-publisher/publish-with-multiple-model.tsx
@@ -5,12 +5,7 @@ import type {
import type { FC } from 'react'
import type { ModelAndParameter } from '../configuration/debug/types'
import { Button } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { RiArrowDownSLine } from '@remixicon/react'
import { useQuery } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next'
@@ -66,8 +61,8 @@ const PublishWithMultipleModel: FC<PublishWithMultipleModelProps> = ({
const triggerDisabled = disabled || !validModelConfigs.length
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
disabled={triggerDisabled}
render={<Button variant="primary" disabled={triggerDisabled} className="w-full" />}
>
@@ -75,13 +70,13 @@ const PublishWithMultipleModel: FC<PublishWithMultipleModelProps> = ({
{t(($) => $['operation.applyConfig'], { ns: 'appDebug' })}
<RiArrowDownSLine className="size-3" />
</>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-[288px] p-1">
+ </MenuTrigger>
+ <MenuContent className="w-[288px]">
<div className="flex h-5.5 items-center px-3 text-xs font-medium text-text-tertiary">
{t(($) => $.publishAs, { ns: 'appDebug' })}
</div>
{validModelConfigs.map((item, index) => (
- <DropdownMenuItem key={item.id} className="gap-0 px-3" onClick={() => onSelect(item)}>
+ <MenuItem key={item.id} className="gap-0 px-3" onClick={() => onSelect(item)}>
<span className="min-w-4.5 italic">#{index + 1}</span>
<ModelIcon modelName={item.model} provider={item.providerItem} className="ml-2" />
<div
@@ -90,10 +85,10 @@ const PublishWithMultipleModel: FC<PublishWithMultipleModelProps> = ({
>
{renderI18nObject(item.modelItem.label, language)}
</div>
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/app/configuration/config-var/select-var-type.tsx b/web/app/components/app/configuration/config-var/select-var-type.tsx
index 080948ae6a3..7cabea8ea4d 100644
--- a/web/app/components/app/configuration/config-var/select-var-type.tsx
+++ b/web/app/components/app/configuration/config-var/select-var-type.tsx
@@ -1,13 +1,7 @@
'use client'
import type { FC } from 'react'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import { OperationButton } from '@/app/components/app/configuration/base/operation-button'
@@ -28,7 +22,7 @@ type ItemProps = {
const SelectItem: FC<ItemProps> = ({ text, type, value, iconClassName, onClick }) => {
return (
- <DropdownMenuItem
+ <MenuItem
closeOnClick
className="h-8 rounded-lg px-3 text-text-primary"
onClick={() => onClick(value)}
@@ -39,7 +33,7 @@ const SelectItem: FC<ItemProps> = ({ text, type, value, iconClassName, onClick }
<InputVarTypeIcon type={type!} className="size-4 text-text-secondary" />
)}
<div className="ml-2 truncate text-xs text-text-primary">{text}</div>
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -49,9 +43,9 @@ const SelectVarType: FC<Props> = ({ onChange }) => {
onChange(value)
}
return (
- <DropdownMenu>
- <DropdownMenuTrigger render={<OperationButton operation="add" />} />
- <DropdownMenuContent
+ <Menu>
+ <MenuTrigger render={<OperationButton operation="add" />} />
+ <MenuContent
sideOffset={8}
alignOffset={-2}
className="min-w-48 rounded-lg border bg-components-panel-bg-blur p-0 backdrop-blur-xs"
@@ -88,7 +82,7 @@ const SelectVarType: FC<Props> = ({ onChange }) => {
onClick={handleChange}
></SelectItem>
</div>
- <DropdownMenuSeparator className="my-0" />
+ <MenuSeparator className="my-0" />
<div className="p-1">
<SelectItem
iconClassName={'i-custom-vender-solid-development-api-connection'}
@@ -97,8 +91,8 @@ const SelectVarType: FC<Props> = ({ onChange }) => {
onClick={handleChange}
></SelectItem>
</div>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
export default React.memo(SelectVarType)
diff --git a/web/app/components/app/configuration/config/automatic/version-selector.tsx b/web/app/components/app/configuration/config/automatic/version-selector.tsx
index 205004bbab5..bd8c043bcee 100644
--- a/web/app/components/app/configuration/config/automatic/version-selector.tsx
+++ b/web/app/components/app/configuration/config/automatic/version-selector.tsx
@@ -1,12 +1,12 @@
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroupLabel,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroupLabel,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { RiArrowDownSLine } from '@remixicon/react'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
@@ -28,8 +28,8 @@ function VersionSelector({ versionLen, value, onChange }: VersionSelectorProps)
const isLatest = value === versionLen - 1
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
disabled={!moreThanOneVersion}
className="flex cursor-pointer items-center border-none bg-transparent p-0 system-xs-medium text-text-tertiary data-disabled:cursor-default data-popup-open:text-text-secondary"
>
@@ -38,19 +38,19 @@ function VersionSelector({ versionLen, value, onChange }: VersionSelectorProps)
{isLatest && ` · ${t(($) => $['generate.latest'], { ns: 'appGeneration' })}`}
</div>
{moreThanOneVersion && <RiArrowDownSLine className="size-3" />}
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" alignOffset={-12} className="w-52 p-1">
- <DropdownMenuRadioGroup
+ </MenuTrigger>
+ <MenuContent align="start" alignOffset={-12} className="w-52">
+ <MenuRadioGroup
value={value}
onValueChange={(nextValue) => {
onChange(nextValue)
}}
>
- <DropdownMenuGroupLabel className="flex h-5.5 items-center py-0">
+ <MenuGroupLabel className="flex h-5.5 items-center py-0">
{t(($) => $['generate.versions'], { ns: 'appGeneration' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{versions.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option.value}
value={option.value}
closeOnClick
@@ -58,12 +58,12 @@ function VersionSelector({ versionLen, value, onChange }: VersionSelectorProps)
title={option.label}
>
<div className="mr-1 grow truncate px-1">{option.label}</div>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx b/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
index 4f101bc8173..73729ad5e9d 100644
--- a/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
+++ b/web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
@@ -1,13 +1,7 @@
import type { CSSProperties, FC } from 'react'
import type { ModelAndParameter } from '../types'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useQuery } from '@tanstack/react-query'
import { memo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -85,8 +79,8 @@ const DebugItem: FC<DebugItemProps> = ({ modelAndParameter, className, style })
#{index + 1}
</div>
<ModelParameterTrigger modelAndParameter={modelAndParameter} />
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -96,31 +90,31 @@ const DebugItem: FC<DebugItemProps> = ({ modelAndParameter, className, style })
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-40">
+ <MenuContent align="end" className="min-w-40">
{showDuplicate && (
- <DropdownMenuItem className="system-md-regular" onClick={handleDuplicate}>
+ <MenuItem className="system-md-regular" onClick={handleDuplicate}>
{t(($) => $.duplicateModel, { ns: 'appDebug' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{showDebugAsSingleModel && (
- <DropdownMenuItem className="system-md-regular" onClick={handleDebugAsSingleModel}>
+ <MenuItem className="system-md-regular" onClick={handleDebugAsSingleModel}>
{t(($) => $.debugAsSingleModel, { ns: 'appDebug' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{showRemove && (
<>
- {(showDuplicate || showDebugAsSingleModel) && <DropdownMenuSeparator />}
- <DropdownMenuItem
+ {(showDuplicate || showDebugAsSingleModel) && <MenuSeparator />}
+ <MenuItem
variant="destructive"
className="system-md-regular"
onClick={handleRemove}
>
{t(($) => $['operation.remove'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
<div style={{ height: 'calc(100% - 40px)' }}>
{(mode === 'chat' || mode === 'agent-chat') &&
diff --git a/web/app/components/app/create-app-dropdown.tsx b/web/app/components/app/create-app-menu.tsx
similarity index 71%
rename from web/app/components/app/create-app-dropdown.tsx
rename to web/app/components/app/create-app-menu.tsx
index 49caa0e626c..4aa55174ff5 100644
--- a/web/app/components/app/create-app-dropdown.tsx
+++ b/web/app/components/app/create-app-menu.tsx
@@ -2,20 +2,20 @@
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import {
- getStepByStepTourDropdownMenuContentProps,
- useStepByStepTourControlledDropdown,
-} from '@/app/components/step-by-step-tour/dropdown-menu'
+ getStepByStepTourMenuContentProps,
+ useStepByStepTourControlledMenu,
+} from '@/app/components/step-by-step-tour/menu'
-type CreateAppDropdownProps = {
+type CreateAppMenuProps = {
onCreateBlank?: () => void
onCreateTemplate?: () => void
onImportDSL?: () => void
@@ -24,22 +24,22 @@ type CreateAppDropdownProps = {
stepByStepTourHighlightPart?: string
}
-export function CreateAppDropdown({
+export function CreateAppMenu({
onCreateBlank,
onCreateTemplate,
onImportDSL,
stepByStepTourControlledOpen,
stepByStepTourTarget,
stepByStepTourHighlightPart,
-}: CreateAppDropdownProps) {
+}: CreateAppMenuProps) {
const { t } = useTranslation(['app', 'common'])
- const menu = useStepByStepTourControlledDropdown({
+ const menu = useStepByStepTourControlledMenu({
controlledOpen: stepByStepTourControlledOpen,
})
return (
- <DropdownMenu modal={false} open={menu.open} onOpenChange={menu.onOpenChange}>
- <DropdownMenuTrigger
+ <Menu modal={false} open={menu.open} onOpenChange={menu.onOpenChange}>
+ <MenuTrigger
render={
<Button
data-step-by-step-tour-target={stepByStepTourTarget}
@@ -53,8 +53,9 @@ export function CreateAppDropdown({
</Button>
}
/>
- <DropdownMenuContent
- {...getStepByStepTourDropdownMenuContentProps({
+ <MenuContent
+ align="end"
+ {...getStepByStepTourMenuContentProps({
disableMotion: menu.controlled,
highlightPart: menu.controlled ? stepByStepTourHighlightPart : undefined,
interactionMode: menu.controlled ? 'presentation' : 'interactive',
@@ -62,9 +63,9 @@ export function CreateAppDropdown({
})}
>
{(onCreateBlank || onCreateTemplate) && (
- <DropdownMenuGroup className="py-1">
+ <MenuGroup className="py-1">
{onCreateBlank && (
- <DropdownMenuItem
+ <MenuItem
className="py-1 system-md-regular text-text-secondary"
onClick={onCreateBlank}
>
@@ -75,10 +76,10 @@ export function CreateAppDropdown({
<span className="min-w-0 flex-1 truncate px-1">
{t(($) => $['newApp.startFromBlank'], { ns: 'app' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{onCreateTemplate && (
- <DropdownMenuItem
+ <MenuItem
className="py-1 system-md-regular text-text-secondary"
onClick={onCreateTemplate}
>
@@ -89,16 +90,14 @@ export function CreateAppDropdown({
<span className="min-w-0 flex-1 truncate px-1">
{t(($) => $['newApp.startFromTemplate'], { ns: 'app' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuGroup>
- )}
- {onImportDSL && (onCreateBlank || onCreateTemplate) && (
- <DropdownMenuSeparator className="my-0" />
+ </MenuGroup>
)}
+ {onImportDSL && (onCreateBlank || onCreateTemplate) && <MenuSeparator className="my-0" />}
{onImportDSL && (
- <DropdownMenuGroup className="py-1">
- <DropdownMenuItem className="h-auto items-start py-1.5" onClick={onImportDSL}>
+ <MenuGroup className="py-1">
+ <MenuItem className="h-auto items-start py-1.5" onClick={onImportDSL}>
<span className="flex h-5 shrink-0 items-center py-0.5">
<span aria-hidden className="i-ri-file-upload-line size-4 text-text-secondary" />
</span>
@@ -110,10 +109,10 @@ export function CreateAppDropdown({
{t(($) => $.importAppDescription, { ns: 'app' })}
</span>
</span>
- </DropdownMenuItem>
- </DropdownMenuGroup>
+ </MenuItem>
+ </MenuGroup>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/app/deploy/environment-table/deploy-menu/index.tsx b/web/app/components/app/deploy/environment-table/deploy-menu/index.tsx
index c204438e283..866603f4582 100644
--- a/web/app/components/app/deploy/environment-table/deploy-menu/index.tsx
+++ b/web/app/components/app/deploy/environment-table/deploy-menu/index.tsx
@@ -3,13 +3,13 @@
import type { OpenDeploymentDialog } from '../../types'
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useAtomValue } from 'jotai'
import { useRef } from 'react'
import { useTranslation } from 'react-i18next'
@@ -43,8 +43,8 @@ export function EnvironmentDeployMenu({
const triggerRef = useRef<HTMLButtonElement | null>(null)
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<Button
ref={triggerRef}
@@ -57,22 +57,24 @@ export function EnvironmentDeployMenu({
</Button>
}
/>
- <DropdownMenuContent aria-busy={isLoading || isRetrying} className="w-42 p-1">
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel className="px-2 py-1">
- {t(($) => $['card.notDeployed'])}
- </DropdownMenuGroupLabel>
+ <MenuContent
+ align={isEmptyState ? undefined : 'end'}
+ aria-busy={isLoading || isRetrying}
+ className="w-42"
+ >
+ <MenuGroup>
+ <MenuGroupLabel className="py-1">{t(($) => $['card.notDeployed'])}</MenuGroupLabel>
{isLoading ? (
- <LoadingPlaceholder className="h-7" />
+ <LoadingPlaceholder className="mx-1 h-7" />
) : isError ? (
<div className="flex flex-col items-center">
- <p role="alert" className="px-2 py-1.5 system-xs-regular text-text-destructive">
+ <p role="alert" className="px-3 py-1.5 system-xs-regular text-text-destructive">
{t(($) => $['common.loadFailed'])}
</p>
- <DropdownMenuItem
+ <MenuItem
closeOnClick={false}
disabled={isRetrying}
- className="mx-0 h-6 w-fit justify-center rounded-md text-xs font-medium text-components-button-ghost-text"
+ className="h-6 w-fit justify-center rounded-md text-xs font-medium text-components-button-ghost-text"
onClick={() => void refetchEnvironments()}
>
<span aria-hidden className="i-ri-reset-left-line size-3" />
@@ -83,19 +85,19 @@ export function EnvironmentDeployMenu({
className="i-ri-loader-2-line size-3 animate-spin motion-reduce:animate-none"
/>
)}
- </DropdownMenuItem>
+ </MenuItem>
</div>
) : undeployedEnvironments.length === 0 ? (
- <p role="status" className="px-2 py-1.5 system-xs-regular text-text-tertiary">
+ <p role="status" className="px-3 py-1.5 system-xs-regular text-text-tertiary">
{t(($) => $['deployDrawer.noNewEnvironmentAvailable'])}
</p>
) : null}
{!isLoading &&
!isError &&
undeployedEnvironments.map((environment) => (
- <DropdownMenuItem
+ <MenuItem
key={environment.id}
- className="mx-0 gap-2 py-1.5"
+ className="gap-2 py-1.5"
onClick={() => {
onOpenDeployment(
{
@@ -114,10 +116,10 @@ export function EnvironmentDeployMenu({
<span className="grow truncate system-md-regular text-text-secondary">
{environment.display_name}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/app/deploy/environment-table/row-actions.tsx b/web/app/components/app/deploy/environment-table/row-actions.tsx
index 69ead5a16c7..51a4a015106 100644
--- a/web/app/components/app/deploy/environment-table/row-actions.tsx
+++ b/web/app/components/app/deploy/environment-table/row-actions.tsx
@@ -5,14 +5,8 @@ import type { DeploymentVersion } from '../utils/version'
import type { OpenUndeployDialog } from './types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Fragment, useRef } from 'react'
import { useTranslation } from 'react-i18next'
import { getWorkflowVersionName } from '@/app/components/workflow/utils/version'
@@ -145,8 +139,8 @@ export function EnvironmentRowActions({
{rowActionLabel(primaryAction, row, t, defaultVersionName)}
</span>
</Button>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<IconButton
ref={menuTriggerRef}
@@ -159,11 +153,11 @@ export function EnvironmentRowActions({
</IconButton>
}
/>
- <DropdownMenuContent className="w-50">
+ <MenuContent align="end" className="w-50">
{moreActions.map((action, index) => (
<Fragment key={action.kind}>
- {action.kind === 'undeploy' && index > 0 && <DropdownMenuSeparator />}
- <DropdownMenuItem
+ {action.kind === 'undeploy' && index > 0 && <MenuSeparator />}
+ <MenuItem
disabled={action.disabled}
className="gap-2 px-2"
onClick={() => {
@@ -180,11 +174,11 @@ export function EnvironmentRowActions({
<span className="min-w-0 flex-1 truncate system-md-regular text-text-secondary">
{rowActionLabel(action, row, t, defaultVersionName)}
</span>
- </DropdownMenuItem>
+ </MenuItem>
</Fragment>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
)
}
diff --git a/web/app/components/apps/app-card/interactions.tsx b/web/app/components/apps/app-card/interactions.tsx
index d74b2f837d7..11e4dfd309d 100644
--- a/web/app/components/apps/app-card/interactions.tsx
+++ b/web/app/components/apps/app-card/interactions.tsx
@@ -17,14 +17,8 @@ import {
ContextMenuTrigger,
} from '@langgenius/dify-ui/context-menu'
import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Toggle } from '@langgenius/dify-ui/toggle'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { useMutation, useSuspenseQuery } from '@tanstack/react-query'
@@ -36,9 +30,9 @@ import { AppMetadataForm } from '@/app/components/app/app-metadata'
import { useExportAppDsl, useExportWorkflowAppDsl } from '@/app/components/app/use-export-app-dsl'
import { buildInstalledAppPath } from '@/app/components/explore/installed-app/routes'
import {
- getStepByStepTourDropdownMenuContentProps,
- useStepByStepTourControlledDropdown,
-} from '@/app/components/step-by-step-tour/dropdown-menu'
+ getStepByStepTourMenuContentProps,
+ useStepByStepTourControlledMenu,
+} from '@/app/components/step-by-step-tour/menu'
import { toast } from '@/app/notifications'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { userProfileQueryOptions } from '@/features/account-profile/client'
@@ -74,7 +68,7 @@ function requiresPublishedWorkflowInExplore(app: AppPartial) {
type AppCardOperationsMenuItemsProps = {
app: AppPartial
- kind: 'context' | 'dropdown'
+ kind: 'context' | 'menu'
shouldShowEditOption: boolean
shouldShowDuplicateOption: boolean
shouldShowExportOption: boolean
@@ -125,8 +119,8 @@ function AppCardOperationsMenuItems({
const hasCreateExportGroup = shouldShowDuplicateOption || shouldShowExportOption
const hasSwitchOrExploreGroup = shouldShowSwitchOption || shouldShowOpenInExploreOption
const hasAccessDeleteGroup = shouldShowAccessConfigOption || shouldShowDeleteOption
- const MenuItem = kind === 'context' ? ContextMenuItem : DropdownMenuItem
- const MenuSeparator = kind === 'context' ? ContextMenuSeparator : DropdownMenuSeparator
+ const ActionItem = kind === 'context' ? ContextMenuItem : MenuItem
+ const ActionSeparator = kind === 'context' ? ContextMenuSeparator : MenuSeparator
function handleMenuAction(event: MouseEvent<HTMLElement>, action: () => void) {
event.stopPropagation()
@@ -167,25 +161,28 @@ function AppCardOperationsMenuItems({
return (
<>
{shouldShowEditOption && (
- <MenuItem className="gap-2 px-3" onClick={(event) => handleMenuAction(event, onEdit)}>
+ <ActionItem className="gap-2 px-3" onClick={(event) => handleMenuAction(event, onEdit)}>
<span className="system-sm-regular text-text-secondary">
{t(($) => $.editApp, { ns: 'app' })}
</span>
- </MenuItem>
+ </ActionItem>
)}
{hasEditGroup &&
(hasCreateExportGroup || hasSwitchOrExploreGroup || hasAccessDeleteGroup) && (
- <MenuSeparator />
+ <ActionSeparator />
)}
{shouldShowDuplicateOption && (
- <MenuItem className="gap-2 px-3" onClick={(event) => handleMenuAction(event, onDuplicate)}>
+ <ActionItem
+ className="gap-2 px-3"
+ onClick={(event) => handleMenuAction(event, onDuplicate)}
+ >
<span className="system-sm-regular text-text-secondary">
{t(($) => $.duplicate, { ns: 'app' })}
</span>
- </MenuItem>
+ </ActionItem>
)}
{shouldShowExportOption && (
- <MenuItem
+ <ActionItem
className="gap-2 px-3"
disabled={isExporting}
onClick={(event) => handleMenuAction(event, onExport)}
@@ -193,37 +190,37 @@ function AppCardOperationsMenuItems({
<span className="system-sm-regular text-text-secondary">
{t(($) => $.exportApp, { ns: 'app' })}
</span>
- </MenuItem>
+ </ActionItem>
)}
{hasCreateExportGroup && (hasSwitchOrExploreGroup || hasAccessDeleteGroup) && (
- <MenuSeparator />
+ <ActionSeparator />
)}
{shouldShowSwitchOption && (
- <MenuItem className="gap-2 px-3" onClick={(event) => handleMenuAction(event, onSwitch)}>
+ <ActionItem className="gap-2 px-3" onClick={(event) => handleMenuAction(event, onSwitch)}>
<span className="text-sm/5 text-text-secondary">{t(($) => $.switch, { ns: 'app' })}</span>
- </MenuItem>
+ </ActionItem>
)}
{shouldShowOpenInExploreOption && (
- <MenuItem className="gap-2 px-3" onClick={handleOpenInstalledApp}>
+ <ActionItem className="gap-2 px-3" onClick={handleOpenInstalledApp}>
<span className="system-sm-regular text-text-secondary">
{t(($) => $.openInExplore, { ns: 'app' })}
</span>
- </MenuItem>
+ </ActionItem>
)}
- {hasSwitchOrExploreGroup && hasAccessDeleteGroup && <MenuSeparator />}
+ {hasSwitchOrExploreGroup && hasAccessDeleteGroup && <ActionSeparator />}
{shouldShowAccessConfigOption && (
- <MenuItem
+ <ActionItem
className="gap-2 px-3"
onClick={(event) => handleMenuAction(event, onAccessConfig)}
>
<span className="text-sm/5 text-text-secondary">
{t(($) => $['settings.resourceAccess'], { ns: 'navigation' })}
</span>
- </MenuItem>
+ </ActionItem>
)}
- {shouldShowAccessConfigOption && shouldShowDeleteOption && <MenuSeparator />}
+ {shouldShowAccessConfigOption && shouldShowDeleteOption && <ActionSeparator />}
{shouldShowDeleteOption && (
- <MenuItem
+ <ActionItem
variant="destructive"
className="gap-2 px-3"
onClick={(event) => handleMenuAction(event, onDelete)}
@@ -231,7 +228,7 @@ function AppCardOperationsMenuItems({
<span className="system-sm-regular">
{t(($) => $['operation.delete'], { ns: 'common' })}
</span>
- </MenuItem>
+ </ActionItem>
)}
</>
)
@@ -275,7 +272,7 @@ export function AppCardInteractions({
)
const editNameRef = useRef<HTMLInputElement>(null)
const [activeDialog, setActiveDialog] = useState<'duplicate' | 'edit' | 'switch' | null>(null)
- const operationsMenu = useStepByStepTourControlledDropdown({
+ const operationsMenu = useStepByStepTourControlledMenu({
allowTriggerCloseWhileControlled: false,
controlledOpen: stepByStepTourActionMenuOpen,
})
@@ -481,12 +478,12 @@ export function AppCardInteractions({
<TooltipContent>{starToggleLabel}</TooltipContent>
</Tooltip>
{shouldShowOperationsMenu && (
- <DropdownMenu
+ <Menu
modal={false}
open={isOperationsMenuOpen}
onOpenChange={operationsMenu.onOpenChange}
>
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<IconButton
size="lg"
@@ -500,16 +497,17 @@ export function AppCardInteractions({
</IconButton>
}
/>
- <DropdownMenuContent
- {...getStepByStepTourDropdownMenuContentProps({
+ <MenuContent
+ align="end"
+ {...getStepByStepTourMenuContentProps({
highlightPart: stepByStepTourActionMenuHighlightPart,
interactionMode: operationsMenu.controlled ? 'presentation' : 'interactive',
className: OPERATIONS_MENU_POPUP_CLASS_NAME,
})}
>
- <AppCardOperationsMenuItems kind="dropdown" {...operationsMenuItemsProps} />
- </DropdownMenuContent>
- </DropdownMenu>
+ <AppCardOperationsMenuItems kind="menu" {...operationsMenuItemsProps} />
+ </MenuContent>
+ </Menu>
)}
</div>
</div>
diff --git a/web/app/components/apps/app-list-header.tsx b/web/app/components/apps/app-list-header.tsx
index 3f66fdd14db..b2ed76bff63 100644
--- a/web/app/components/apps/app-list-header.tsx
+++ b/web/app/components/apps/app-list-header.tsx
@@ -4,7 +4,7 @@ import type { GetAppsData } from '@dify/contracts/api/console/apps/types.gen'
import type { AppListUrlQuery } from './query-params'
import { useAtomValue } from 'jotai'
import { useTranslation } from 'react-i18next'
-import { CreateAppDropdown } from '@/app/components/app/create-app-dropdown'
+import { CreateAppMenu } from '@/app/components/app/create-app-menu'
import { SearchInput } from '@/app/components/base/search-input'
import {
activeStepByStepTourGuideGroupAtom,
@@ -116,7 +116,7 @@ export function AppListHeader({
{t(($) => $['studio.viewSnippets'], { ns: 'app' })}
</StudioListLink>
{showCreateButton && (
- <CreateAppDropdown
+ <CreateAppMenu
onCreateBlank={onCreateBlank}
onCreateTemplate={onCreateTemplate}
onImportDSL={onImportDSL}
diff --git a/web/app/components/base/chat/chat-with-history/header-in-mobile.tsx b/web/app/components/base/chat/chat-with-history/header-in-mobile.tsx
index 7991ac93ecb..a207a188aab 100644
--- a/web/app/components/base/chat/chat-with-history/header-in-mobile.tsx
+++ b/web/app/components/base/chat/chat-with-history/header-in-mobile.tsx
@@ -26,7 +26,7 @@ import AppIcon from '@/app/components/base/app-icon'
import InputsFormContent from '@/app/components/base/chat/chat-with-history/inputs-form/content'
import RenameModal from '@/app/components/base/chat/chat-with-history/sidebar/rename-modal'
import { useChatWithHistoryContext } from './context'
-import MobileOperationDropdown from './header/mobile-operation-dropdown'
+import MobileOperationMenu from './header/mobile-operation-menu'
import Operation from './header/operation'
import Sidebar from './sidebar'
@@ -121,7 +121,7 @@ const HeaderInMobile = () => {
/>
)}
</div>
- <MobileOperationDropdown
+ <MobileOperationMenu
handleResetChat={handleNewConversation}
handleViewChatSettings={() => setShowChatSettings(true)}
hideViewChatSettings={inputsForms.length < 1}
diff --git a/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx b/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-menu.spec.tsx
similarity index 84%
rename from web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx
rename to web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-menu.spec.tsx
index c02f16e8095..ac83d9ae0d7 100644
--- a/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-menu.spec.tsx
@@ -2,9 +2,9 @@ import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import * as React from 'react'
import { describe, expect, it, vi } from 'vite-plus/test'
-import MobileOperationDropdown from '../mobile-operation-dropdown'
+import MobileOperationMenu from '../mobile-operation-menu'
-describe('MobileOperationDropdown Component', () => {
+describe('MobileOperationMenu Component', () => {
const defaultProps = {
handleResetChat: vi.fn(),
handleViewChatSettings: vi.fn(),
@@ -12,7 +12,7 @@ describe('MobileOperationDropdown Component', () => {
it('handles hideViewChatSettings prop correctly', async () => {
const user = userEvent.setup()
- render(<MobileOperationDropdown {...defaultProps} hideViewChatSettings={true} />)
+ render(<MobileOperationMenu {...defaultProps} hideViewChatSettings={true} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
@@ -22,7 +22,7 @@ describe('MobileOperationDropdown Component', () => {
it('invokes callbacks when menu items are clicked', async () => {
const user = userEvent.setup()
- render(<MobileOperationDropdown {...defaultProps} />)
+ render(<MobileOperationMenu {...defaultProps} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
diff --git a/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx b/web/app/components/base/chat/chat-with-history/header/mobile-operation-menu.tsx
similarity index 67%
rename from web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
rename to web/app/components/base/chat/chat-with-history/header/mobile-operation-menu.tsx
index e1ac9d46e42..e55256e8ad9 100644
--- a/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/mobile-operation-menu.tsx
@@ -1,10 +1,5 @@
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
type Props = Readonly<{
@@ -13,7 +8,7 @@ type Props = Readonly<{
hideViewChatSettings?: boolean
}>
-const MobileOperationDropdown = ({
+const MobileOperationMenu = ({
handleResetChat,
handleViewChatSettings,
hideViewChatSettings = false,
@@ -24,8 +19,8 @@ const MobileOperationDropdown = ({
}
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -36,24 +31,21 @@ const MobileOperationDropdown = ({
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-40">
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleMenuAction(handleResetChat)}
- >
+ <MenuContent align="end" className="min-w-40">
+ <MenuItem className="system-md-regular" onClick={() => handleMenuAction(handleResetChat)}>
<span className="grow">{t(($) => $['chat.resetChat'], { ns: 'share' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
{!hideViewChatSettings && (
- <DropdownMenuItem
+ <MenuItem
className="system-md-regular"
onClick={() => handleMenuAction(handleViewChatSettings)}
>
<span className="grow">{t(($) => $['chat.viewChatSettings'], { ns: 'share' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
-export default MobileOperationDropdown
+export default MobileOperationMenu
diff --git a/web/app/components/base/chat/chat-with-history/header/operation.tsx b/web/app/components/base/chat/chat-with-history/header/operation.tsx
index fb92116d757..e40eefc7881 100644
--- a/web/app/components/base/chat/chat-with-history/header/operation.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/operation.tsx
@@ -1,11 +1,6 @@
'use client'
import type { FC } from 'react'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
@@ -35,38 +30,38 @@ const Operation: FC<Props> = ({
const { t } = useTranslation(['explore'])
return (
- <DropdownMenu>
- <DropdownMenuTrigger className="flex cursor-pointer items-center rounded-lg border-none bg-transparent p-1.5 pl-2 text-text-secondary hover:bg-state-base-hover data-popup-open:bg-state-base-hover">
+ <Menu>
+ <MenuTrigger className="flex cursor-pointer items-center rounded-lg border-none bg-transparent p-1.5 pl-2 text-text-secondary hover:bg-state-base-hover data-popup-open:bg-state-base-hover">
<span className="system-md-semibold">{title}</span>
<span aria-hidden className="i-ri-arrow-down-s-line size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="min-w-30">
- <DropdownMenuItem className="system-md-regular" onClick={togglePin}>
+ </MenuTrigger>
+ <MenuContent align="start" className="min-w-30">
+ <MenuItem className="system-md-regular" onClick={togglePin}>
<span className="grow">
{isPinned
? t(($) => $['sidebar.action.unpin'], { ns: 'explore' })
: t(($) => $['sidebar.action.pin'], { ns: 'explore' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
{isShowRenameConversation && (
- <DropdownMenuItem
+ <MenuItem
className="system-md-regular"
onClick={() => onRenameConversation && deferAction(onRenameConversation)}
>
<span className="grow">{t(($) => $['sidebar.action.rename'], { ns: 'explore' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{isShowDelete && (
- <DropdownMenuItem
+ <MenuItem
variant="destructive"
className="system-md-regular"
onClick={() => deferAction(onDelete)}
>
<span className="grow">{t(($) => $['sidebar.action.delete'], { ns: 'explore' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
export default React.memo(Operation)
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/index.tsx b/web/app/components/base/chat/chat-with-history/sidebar/index.tsx
index e3df3404352..d03d8aaa610 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/index.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/index.tsx
@@ -20,7 +20,7 @@ import AppIcon from '@/app/components/base/app-icon'
import List from '@/app/components/base/chat/chat-with-history/sidebar/list'
import RenameModal from '@/app/components/base/chat/chat-with-history/sidebar/rename-modal'
import { DifyLogo } from '@/app/components/base/logo/dify-logo'
-import MenuDropdown from '@/app/components/share/text-generation/menu-dropdown'
+import TextGenerationMenu from '@/app/components/share/text-generation/text-generation-menu'
import { systemFeaturesQueryOptions } from '@/features/system-features/client'
import { useChatWithHistoryContext } from '../context'
@@ -162,7 +162,12 @@ const Sidebar = ({ isPanel, toggleButtonRef }: Props) => {
)}
</div>
<div className="flex shrink-0 items-center justify-between p-3">
- <MenuDropdown hideLogout={isInstalledApp} side="top" align="start" data={appData?.site} />
+ <TextGenerationMenu
+ hideLogout={isInstalledApp}
+ side="top"
+ align="start"
+ data={appData?.site}
+ />
{/* powered by */}
<div className="shrink-0">
{!appData?.custom_config?.remove_webapp_brand && (
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx b/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
index f2a22812857..189aa1eec4e 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
@@ -1,13 +1,8 @@
'use client'
import type { FC } from 'react'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useCallback } from 'react'
import { useTranslation } from 'react-i18next'
@@ -39,8 +34,8 @@ const Operation: FC<Props> = ({
queueMicrotask(action)
}, [])
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -55,8 +50,8 @@ const Operation: FC<Props> = ({
}
onClick={(e) => e.stopPropagation()}
/>
- <DropdownMenuContent className="min-w-30" onClick={(e) => e.stopPropagation()}>
- <DropdownMenuItem
+ <MenuContent align="end" className="min-w-30" onClick={(e) => e.stopPropagation()}>
+ <MenuItem
className="gap-2 px-2 system-md-regular"
onClick={(e) => {
e.stopPropagation()
@@ -74,9 +69,9 @@ const Operation: FC<Props> = ({
? t(($) => $['sidebar.action.unpin'], { ns: 'explore' })
: t(($) => $['sidebar.action.pin'], { ns: 'explore' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
{isShowRenameConversation && (
- <DropdownMenuItem
+ <MenuItem
className="gap-2 px-2 system-md-regular"
onClick={(e) => {
e.stopPropagation()
@@ -85,10 +80,10 @@ const Operation: FC<Props> = ({
>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-tertiary" />
<span className="grow">{t(($) => $['sidebar.action.rename'], { ns: 'explore' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{isShowDelete && (
- <DropdownMenuItem
+ <MenuItem
variant="destructive"
className="gap-2 px-2 system-md-regular"
onClick={(e) => {
@@ -98,10 +93,10 @@ const Operation: FC<Props> = ({
>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span className="grow">{t(($) => $['sidebar.action.delete'], { ns: 'explore' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
export default React.memo(Operation)
diff --git a/web/app/components/base/search-input/index.tsx b/web/app/components/base/search-input/index.tsx
index 49fbd430c8f..d5659d0e3bf 100644
--- a/web/app/components/base/search-input/index.tsx
+++ b/web/app/components/base/search-input/index.tsx
@@ -13,7 +13,7 @@ type SearchInputClearProps = Pick<
'aria-label': string
}
-// Same look as dify-ui `ComboboxClear` and `DropdownMenuClear`; change all three together.
+// Same look as dify-ui `ComboboxClear` and `MenuClear`; change all three together.
// Spread `clearProps` from `useSearchInput` so the button stays out of the tab order and never
// takes focus from the input.
export function SearchInputClear({ className, ...props }: SearchInputClearProps) {
diff --git a/web/app/components/base/sort/index.tsx b/web/app/components/base/sort/index.tsx
index 2bf03287432..ca07b7ed16a 100644
--- a/web/app/components/base/sort/index.tsx
+++ b/web/app/components/base/sort/index.tsx
@@ -1,12 +1,12 @@
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { useTranslation } from 'react-i18next'
@@ -41,9 +41,9 @@ export function Sort<const Field extends string | number>({
return (
<div className="inline-flex w-fit max-w-full min-w-0 items-center gap-px">
- <DropdownMenu>
+ <Menu>
<div className="relative min-w-0 flex-1">
- <DropdownMenuTrigger className="flex min-h-8 w-full min-w-0 items-center rounded-s-lg border-none bg-components-input-bg-normal px-2 py-1 hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt! data-popup-open:hover:bg-state-base-hover-alt">
+ <MenuTrigger className="flex min-h-8 w-full min-w-0 items-center rounded-s-lg border-none bg-components-input-bg-normal px-2 py-1 hover:bg-state-base-hover-alt data-popup-open:bg-state-base-hover-alt! data-popup-open:hover:bg-state-base-hover-alt">
<span className="flex min-w-0 items-center gap-0.5 px-1">
<span className="system-sm-regular text-text-secondary">
{t(($) => $['sorting.sortBy'], { ns: 'common' })}
@@ -56,30 +56,30 @@ export function Sort<const Field extends string | number>({
aria-hidden
className="i-ri-arrow-down-s-line size-4 shrink-0 text-text-tertiary forced-colors:text-[ButtonText] forced-colors:forced-color-adjust-none"
/>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="relative w-60 p-0">
- <DropdownMenuRadioGroup<Field>
+ </MenuTrigger>
+ <MenuContent align="start" className="relative w-60 p-0">
+ <MenuRadioGroup<Field>
value={value.field}
onValueChange={(field) => onValueChange({ field, order: value.order })}
- className="max-h-72 overflow-auto p-1"
+ className="max-h-72 scroll-py-1 overflow-auto py-1"
>
{items.map((item) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={item.value}
value={item.value}
closeOnClick
- className="mx-0 h-auto min-h-8 gap-2 py-1.5"
+ className="h-auto min-h-8 gap-2 py-1.5"
>
<div className="min-w-0 grow system-sm-medium wrap-anywhere text-text-secondary">
{item.name}
</div>
- <DropdownMenuRadioItemIndicator className="text-util-colors-blue-light-blue-light-600 forced-colors:text-[CanvasText] forced-colors:forced-color-adjust-none" />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator className="text-util-colors-blue-light-blue-light-600 forced-colors:text-[CanvasText] forced-colors:forced-color-adjust-none" />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
+ </MenuRadioGroup>
+ </MenuContent>
</div>
- </DropdownMenu>
+ </Menu>
<Tooltip>
<TooltipTrigger
render={
diff --git a/web/app/components/base/theme-selector.tsx b/web/app/components/base/theme-selector.tsx
index b024361d97d..a71f43b6694 100644
--- a/web/app/components/base/theme-selector.tsx
+++ b/web/app/components/base/theme-selector.tsx
@@ -1,15 +1,15 @@
'use client'
import { useDirection } from '@langgenius/dify-ui/direction-provider'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTheme } from 'next-themes'
import { useTranslation } from 'react-i18next'
@@ -38,8 +38,8 @@ export default function ThemeSelector() {
}
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['theme.theme'], { ns: 'common' })}
@@ -50,34 +50,34 @@ export default function ThemeSelector() {
</IconButton>
}
/>
- <DropdownMenuContent dir={direction} sideOffset={6} className="w-36">
- <DropdownMenuRadioGroup<Theme>
+ <MenuContent dir={direction} sideOffset={6} className="w-36">
+ <MenuRadioGroup<Theme>
value={currentTheme}
onValueChange={(nextTheme) => setTheme(nextTheme)}
>
- <DropdownMenuRadioItem<Theme> value="light" closeOnClick>
+ <MenuRadioItem<Theme> value="light" closeOnClick>
<span className="i-ri-sun-line size-4 text-text-tertiary" />
<span className="grow px-1 system-md-regular">
{t(($) => $['theme.light'], { ns: 'common' })}
</span>
- <DropdownMenuRadioItemIndicator data-testid="light-icon" />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<Theme> value="dark" closeOnClick>
+ <MenuRadioItemIndicator data-testid="light-icon" />
+ </MenuRadioItem>
+ <MenuRadioItem<Theme> value="dark" closeOnClick>
<span className="i-ri-moon-line size-4 text-text-tertiary" />
<span className="grow px-1 system-md-regular">
{t(($) => $['theme.dark'], { ns: 'common' })}
</span>
- <DropdownMenuRadioItemIndicator data-testid="dark-icon" />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<Theme> value="system" closeOnClick>
+ <MenuRadioItemIndicator data-testid="dark-icon" />
+ </MenuRadioItem>
+ <MenuRadioItem<Theme> value="system" closeOnClick>
<span className="i-ri-computer-line size-4 text-text-tertiary" />
<span className="grow px-1 system-md-regular">
{t(($) => $['theme.auto'], { ns: 'common' })}
</span>
- <DropdownMenuRadioItemIndicator data-testid="system-icon" />
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuRadioItemIndicator data-testid="system-icon" />
+ </MenuRadioItem>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/datasets/common/document-picker/document-list.tsx b/web/app/components/datasets/common/document-picker/document-list.tsx
index af46ce86928..c719de56881 100644
--- a/web/app/components/datasets/common/document-picker/document-list.tsx
+++ b/web/app/components/datasets/common/document-picker/document-list.tsx
@@ -1,10 +1,6 @@
'use client'
import type { DocumentWithSegmentsResponse } from '@dify/contracts/api/console/datasets/types.gen'
-import {
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuList,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { MenuItem, MenuLinkItem, MenuList } from '@langgenius/dify-ui/menu'
import { SpinnerIcon } from '@langgenius/dify-ui/spinner'
import { useQuery } from '@tanstack/react-query'
import { useDebouncedValue } from 'foxact/use-debounced-value'
@@ -64,9 +60,9 @@ export default function DocumentList({
{isSearching && <SpinnerIcon aria-hidden="true" />}
{statusText}
</div>
- <DropdownMenuList aria-busy={isSearching}>
+ <MenuList aria-busy={isSearching}>
{documents.map((document) => (
- <DropdownMenuLinkItem
+ <MenuLinkItem
key={document.id}
render={<Link href={`/datasets/${datasetId}/documents/${document.id}`} />}
aria-current={document.id === currentDocumentId ? 'page' : undefined}
@@ -76,14 +72,14 @@ export default function DocumentList({
<span className="min-w-0 truncate system-sm-regular text-text-secondary">
{document.name}
</span>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
))}
{isError && (
- <DropdownMenuItem closeOnClick={false} onClick={() => documentsQuery.refetch()}>
+ <MenuItem closeOnClick={false} onClick={() => documentsQuery.refetch()}>
{t(($) => $['operation.retry'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuList>
+ </MenuList>
</>
)
}
diff --git a/web/app/components/datasets/common/document-picker/index.tsx b/web/app/components/datasets/common/document-picker/index.tsx
index 1ed253dcca3..c0d5b819ac2 100644
--- a/web/app/components/datasets/common/document-picker/index.tsx
+++ b/web/app/components/datasets/common/document-picker/index.tsx
@@ -3,13 +3,13 @@ import type { DocumentWithSegmentsResponse } from '@dify/contracts/api/console/d
import type { ParentMode } from '@/models/datasets'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuFilterProvider,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuFilterProvider,
+ MenuInput,
+ MenuInputGroup,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
import { getUploadFileExtension } from '@/app/components/datasets/documents/document-source'
@@ -100,37 +100,37 @@ export function DocumentPicker({ datasetId, currentDocument, parentMode }: Docum
const [searchValue, setSearchValue] = useState('')
return (
- <DropdownMenuFilterProvider filter={null} value={searchValue} onValueChange={setSearchValue}>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <MenuFilterProvider filter={null} value={searchValue} onValueChange={setSearchValue}>
+ <Menu>
+ <MenuTrigger
aria-label={currentDocument?.name || t(($) => $['operation.search'], { ns: 'common' })}
className="ms-1 flex min-w-0 items-center gap-0.5 rounded-lg px-2 py-1 text-start transition-colors hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-state-base-hover motion-reduce:transition-none"
>
<DocumentPickerTriggerValue currentDocument={currentDocument} parentMode={parentMode} />
- </DropdownMenuTrigger>
- <DropdownMenuContent
+ </MenuTrigger>
+ <MenuContent
align="start"
sideOffset={0}
aria-label={t(($) => $['operation.search'], { ns: 'common' })}
className="w-90 max-w-(--available-width)"
>
- <DropdownMenuInputGroup>
+ <MenuInputGroup>
<span
className="i-ri-search-line size-4 shrink-0 text-text-tertiary"
aria-hidden="true"
/>
- <DropdownMenuInput
+ <MenuInput
aria-label={t(($) => $['operation.search'], { ns: 'common' })}
placeholder={t(($) => $['operation.search'], { ns: 'common' })}
/>
- </DropdownMenuInputGroup>
+ </MenuInputGroup>
<DocumentList
datasetId={datasetId}
currentDocumentId={currentDocument?.id}
searchValue={searchValue}
/>
- </DropdownMenuContent>
- </DropdownMenu>
- </DropdownMenuFilterProvider>
+ </MenuContent>
+ </Menu>
+ </MenuFilterProvider>
)
}
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
index 40e9fbe0d88..1c8fff8499c 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/actions.tsx
@@ -1,13 +1,7 @@
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import { DialogTrigger } from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
@@ -43,8 +37,8 @@ const Actions = ({
}
/>
{showMoreOperations && (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
className={cn(
'flex size-8 cursor-pointer items-center justify-center rounded-lg p-0 shadow-xs shadow-shadow-shadow-3',
@@ -53,33 +47,33 @@ const Actions = ({
onClick={(e) => e.stopPropagation()}
>
<span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="min-w-40">
- <DropdownMenuItem
+ </MenuTrigger>
+ <MenuContent align="end" className="min-w-40">
+ <MenuItem
onClick={() => {
openEditModal()
}}
>
{t(($) => $['operations.editInfo'], { ns: 'datasetPipeline' })}
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
onClick={() => {
handleExportDSL()
}}
>
{t(($) => $['operations.exportPipeline'], { ns: 'datasetPipeline' })}
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ </MenuItem>
+ <MenuSeparator />
+ <MenuItem
variant="destructive"
onClick={() => {
handleDelete()
}}
>
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
</div>
)
diff --git a/web/app/components/datasets/documents/components/operations.tsx b/web/app/components/datasets/documents/components/operations.tsx
index f7ead6fe79f..fc4e02008db 100644
--- a/web/app/components/datasets/documents/components/operations.tsx
+++ b/web/app/components/datasets/documents/components/operations.tsx
@@ -1,13 +1,7 @@
import type { OperationName } from '../types'
import { cn } from '@langgenius/dify-ui/cn'
import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { Separator } from '@langgenius/dify-ui/separator'
import { Switch } from '@langgenius/dify-ui/switch'
@@ -241,12 +235,12 @@ const Operations = ({
[canViewSettings, datasetId, detail.id, router],
)
const settingsMenuItem = (
- <DropdownMenuItem className={menuActionClassName} onClick={handleSettingsClick}>
+ <MenuItem className={menuActionClassName} onClick={handleSettingsClick}>
<span aria-hidden className="i-ri-equalizer-2-line size-4 text-text-tertiary" />
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.settings'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)
const enabledLabel = `${t(($) => $['list.status.enabled'], { ns: 'datasetDocuments' })}: ${name}`
const renderListSwitch = () => {
@@ -318,8 +312,8 @@ const Operations = ({
)}
{hasOperationsMenu && (
<>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
className={cn(
isListScene
@@ -341,20 +335,20 @@ const Operations = ({
className="i-ri-more-fill size-4 text-components-button-secondary-text"
/>
</div>
- </DropdownMenuTrigger>
- <DropdownMenuContent className={cn('w-50', className)}>
+ </MenuTrigger>
+ <MenuContent align="end" className={cn('w-50', className)}>
{canShowPrimarySection && (
<>
{canShowRenameAction && (
- <DropdownMenuItem className={menuActionClassName} onClick={handleShowRename}>
+ <MenuItem className={menuActionClassName} onClick={handleShowRename}>
<span aria-hidden className="i-ri-edit-line size-4 text-text-tertiary" />
<span className="text-sm text-text-secondary">
{t(($) => $['list.table.rename'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowSummaryAction && (
- <DropdownMenuItem
+ <MenuItem
className={menuActionClassName}
onClick={() => handleMenuOperation('summary')}
>
@@ -365,11 +359,11 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.summary'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowSettingsAction && settingsMenuItem}
{canShowDownloadAction && (
- <DropdownMenuItem className={menuActionClassName} onClick={handleDownloadClick}>
+ <MenuItem className={menuActionClassName} onClick={handleDownloadClick}>
<span
aria-hidden
className="i-ri-download-2-line size-4 text-text-tertiary"
@@ -377,10 +371,10 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.download'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowSyncAction && (
- <DropdownMenuItem
+ <MenuItem
className={menuActionClassName}
onClick={() => handleMenuOperation('sync')}
>
@@ -388,15 +382,15 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.sync'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{(canShowStatusSection || canShowDeleteAction) && (
- <DropdownMenuSeparator className="h-[0.5px] w-full shrink-0 bg-divider-regular" />
+ <MenuSeparator className="h-[0.5px] w-full shrink-0 bg-divider-regular" />
)}
</>
)}
{canShowPauseAction && (
- <DropdownMenuItem
+ <MenuItem
className={menuActionClassName}
onClick={() => handleMenuOperation('pause')}
>
@@ -404,10 +398,10 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.pause'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowResumeAction && (
- <DropdownMenuItem
+ <MenuItem
className={menuActionClassName}
onClick={() => handleMenuOperation('resume')}
>
@@ -415,10 +409,10 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.resume'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowArchiveAction && (
- <DropdownMenuItem
+ <MenuItem
className={menuActionClassName}
onClick={() => handleMenuOperation('archive')}
>
@@ -426,10 +420,10 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.archive'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowUnarchiveAction && (
- <DropdownMenuItem
+ <MenuItem
className={menuActionClassName}
onClick={() => handleMenuOperation('un_archive')}
>
@@ -437,10 +431,10 @@ const Operations = ({
<span className="text-sm text-text-secondary">
{t(($) => $['list.action.unarchive'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canShowDeleteAction && (
- <DropdownMenuItem
+ <MenuItem
variant="destructive"
className={menuDeleteActionClassName}
onClick={handleDeleteClick}
@@ -452,10 +446,10 @@ const Operations = ({
<span className="text-sm text-text-secondary group-data-highlighted:text-text-destructive">
{t(($) => $['list.action.delete'], { ns: 'datasetDocuments' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</>
)}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
index 6986e889c52..759d09c1bc6 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
@@ -5,8 +5,8 @@ import { useTranslation } from 'react-i18next'
import { useDataSourceStore, useDataSourceStoreWithSelector } from '../../../../store'
import Bucket from './bucket'
import Drive from './drive'
-import Dropdown from './dropdown'
import BreadcrumbItem from './item'
+import ActionsMenu from './menu'
type BreadcrumbsProps = {
breadcrumbs: string[]
@@ -153,7 +153,7 @@ const Breadcrumbs = ({
/>
)
})}
- <Dropdown
+ <ActionsMenu
startIndex={breadcrumbsConfig.prefixBreadcrumbs.length}
breadcrumbs={breadcrumbsConfig.collapsedBreadcrumbs}
onBreadcrumbClick={handleClickBreadcrumb}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/menu/index.tsx
similarity index 69%
rename from web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/index.tsx
rename to web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/menu/index.tsx
index f21ee9d17e1..8bfb92dae95 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/dropdown/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/menu/index.tsx
@@ -1,28 +1,23 @@
import { BreadcrumbItem, BreadcrumbSeparator } from '@langgenius/dify-ui/breadcrumb'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
-type DropdownProps = {
+type ActionsMenuProps = {
startIndex: number
breadcrumbs: string[]
onBreadcrumbClick: (index: number) => void
}
-const Dropdown = ({ startIndex, breadcrumbs, onBreadcrumbClick }: DropdownProps) => {
+const ActionsMenu = ({ startIndex, breadcrumbs, onBreadcrumbClick }: ActionsMenuProps) => {
const { t } = useTranslation(['common'])
return (
<>
<BreadcrumbItem className="shrink-0">
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -32,22 +27,22 @@ const Dropdown = ({ startIndex, breadcrumbs, onBreadcrumbClick }: DropdownProps)
</IconButton>
}
/>
- <DropdownMenuContent align="start" className="w-34 px-1">
+ <MenuContent align="start" className="w-34">
{breadcrumbs.map((breadcrumb, index) => (
- <DropdownMenuItem
+ <MenuItem
key={breadcrumbs.slice(0, index + 1).join('/')}
className="px-3 py-1.5 system-md-regular"
onClick={() => onBreadcrumbClick(startIndex + index)}
>
{breadcrumb}
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</BreadcrumbItem>
<BreadcrumbSeparator className="system-xs-regular text-divider-deep" />
</>
)
}
-export default React.memo(Dropdown)
+export default React.memo(ActionsMenu)
diff --git a/web/app/components/datasets/documents/detail/segment-add/index.tsx b/web/app/components/datasets/documents/detail/segment-add/index.tsx
index 80bb0b63e1d..54b93da7fde 100644
--- a/web/app/components/datasets/documents/detail/segment-add/index.tsx
+++ b/web/app/components/datasets/documents/detail/segment-add/index.tsx
@@ -1,12 +1,7 @@
'use client'
import type { SegmentImportStatus } from '@/types/dataset'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useState } from 'react'
@@ -142,8 +137,8 @@ export function SegmentAdd({
{t(($) => $['list.action.addButton'], { ns: 'datasetDocuments' })}
</span>
</button>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
aria-label={t(($) => $['list.action.batchAdd'], { ns: 'datasetDocuments' })}
disabled={embedding || isPlanUnavailable}
className={cn(
@@ -151,16 +146,13 @@ export function SegmentAdd({
)}
>
<span aria-hidden className={cn('i-ri-arrow-down-s-line size-4', textColor)} />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="min-w-30">
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => openSegmentDialog(showBatchModal)}
- >
+ </MenuTrigger>
+ <MenuContent align="end" className="min-w-30">
+ <MenuItem className="system-md-regular" onClick={() => openSegmentDialog(showBatchModal)}>
{t(($) => $['list.action.batchAdd'], { ns: 'datasetDocuments' })}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
{isPlanUpgradeModalOpen && (
<PlanUpgradeModal
show
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.browser.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.browser.spec.tsx
similarity index 98%
rename from web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.browser.spec.tsx
rename to web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.browser.spec.tsx
index f923fc72d9b..d0f122c9e1f 100644
--- a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.browser.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.browser.spec.tsx
@@ -10,7 +10,7 @@ import { createDatasetFixture } from '@/test/fixtures/dataset'
import { DatasetACLPermission } from '@/utils/permission'
import DatasetCard from '../../index'
import CornerLabels from '../corner-labels'
-import OperationsDropdown from '../operations-dropdown'
+import OperationsMenu from '../operations-menu'
vi.mock('@/next/navigation', () => ({ useRouter: () => ({ push: vi.fn() }) }))
// Tag editing is independently tested and does not own operation visibility.
@@ -135,7 +135,7 @@ it.each([true, false])(
<button type="button">Before dataset</button>
<div role="group" aria-label="Dataset card" className="group relative mt-10 h-40 w-80">
<CornerLabels dataset={dataset} />
- <OperationsDropdown
+ <OperationsMenu
dataset={dataset}
openRenameModal={openRenameModal}
handleExportPipeline={vi.fn()}
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsx
similarity index 92%
rename from web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
rename to web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsx
index 8dbb6870f8f..ab81f653213 100644
--- a/web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/__tests__/operations-menu.spec.tsx
@@ -10,7 +10,7 @@ import { consoleQuery } from '@/service/console'
import { createConsoleQueryClient, renderWithConsoleQuery } from '@/test/console/query-data'
import { createDatasetFixture } from '@/test/fixtures/dataset'
import { DatasetACLPermission } from '@/utils/permission'
-import OperationsDropdown from '../operations-dropdown'
+import OperationsMenu from '../operations-menu'
let mockIsRbacEnabled = true
@@ -36,7 +36,7 @@ const render = (ui: Parameters<typeof renderWithConsoleQuery>[0]) => {
})
}
-describe('OperationsDropdown', () => {
+describe('OperationsMenu', () => {
const createMockDataset = (
overrides: Partial<DatasetListItemResponse> = {},
): DatasetListItemResponse => ({
@@ -72,7 +72,7 @@ describe('OperationsDropdown', () => {
describe('Props', () => {
it('should show delete option when dataset has delete ACL permission', async () => {
const user = userEvent.setup()
- render(<OperationsDropdown {...defaultProps} />)
+ render(<OperationsMenu {...defaultProps} />)
await user.click(screen.getByLabelText('common.operation.more'))
@@ -84,7 +84,7 @@ describe('OperationsDropdown', () => {
const dataset = createMockDataset({
permission_keys: [DatasetACLPermission.Edit],
})
- render(<OperationsDropdown {...defaultProps} dataset={dataset} />)
+ render(<OperationsMenu {...defaultProps} dataset={dataset} />)
await user.click(screen.getByLabelText('common.operation.more'))
@@ -94,7 +94,7 @@ describe('OperationsDropdown', () => {
it('should show export pipeline when runtime_mode is rag_pipeline', async () => {
const user = userEvent.setup()
const dataset = createMockDataset({ runtime_mode: 'rag_pipeline' })
- render(<OperationsDropdown {...defaultProps} dataset={dataset} />)
+ render(<OperationsMenu {...defaultProps} dataset={dataset} />)
await user.click(screen.getByLabelText('common.operation.more'))
@@ -104,7 +104,7 @@ describe('OperationsDropdown', () => {
it('should hide export pipeline when runtime_mode is not rag_pipeline', async () => {
const user = userEvent.setup()
const dataset = createMockDataset({ runtime_mode: 'general' })
- render(<OperationsDropdown {...defaultProps} dataset={dataset} />)
+ render(<OperationsMenu {...defaultProps} dataset={dataset} />)
await user.click(screen.getByLabelText('common.operation.more'))
@@ -118,7 +118,7 @@ describe('OperationsDropdown', () => {
const dataset = createMockDataset({
permission_keys: [DatasetACLPermission.AccessConfig],
})
- render(<OperationsDropdown {...defaultProps} dataset={dataset} />)
+ render(<OperationsMenu {...defaultProps} dataset={dataset} />)
await user.click(screen.getByLabelText('common.operation.more'))
@@ -131,7 +131,7 @@ describe('OperationsDropdown', () => {
const dataset = createMockDataset({
permission_keys: [DatasetACLPermission.AccessConfig, DatasetACLPermission.Delete],
})
- render(<OperationsDropdown {...defaultProps} dataset={dataset} />)
+ render(<OperationsMenu {...defaultProps} dataset={dataset} />)
await user.click(screen.getByLabelText('common.operation.more'))
@@ -146,7 +146,7 @@ describe('OperationsDropdown', () => {
render(
<KnowledgeUpgradeProvider onUpgradeStarted={vi.fn()}>
- <OperationsDropdown {...defaultProps} />
+ <OperationsMenu {...defaultProps} />
</KnowledgeUpgradeProvider>,
)
@@ -178,7 +178,7 @@ describe('OperationsDropdown', () => {
render(
<KnowledgeUpgradeProvider onUpgradeStarted={vi.fn()}>
- <OperationsDropdown {...defaultProps} />
+ <OperationsMenu {...defaultProps} />
</KnowledgeUpgradeProvider>,
)
@@ -208,7 +208,7 @@ describe('OperationsDropdown', () => {
const user = userEvent.setup()
render(
<KnowledgeUpgradeProvider onUpgradeStarted={vi.fn()}>
- <OperationsDropdown
+ <OperationsMenu
{...defaultProps}
dataset={createMockDataset({
knowledge_fs_upgrade: {
@@ -237,7 +237,7 @@ describe('OperationsDropdown', () => {
<button type="button" onClick={onOutsideClick}>
Outside action
</button>
- <OperationsDropdown {...defaultProps} />
+ <OperationsMenu {...defaultProps} />
</div>,
)
@@ -251,7 +251,7 @@ describe('OperationsDropdown', () => {
const onDelete = vi.fn()
render(
- <OperationsDropdown
+ <OperationsMenu
{...defaultProps}
onDelete={onDelete}
stepByStepTourHighlightPart="knowledge-card-actions-menu"
diff --git a/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx b/web/app/components/datasets/list/dataset-card/components/operations-menu.tsx
similarity index 79%
rename from web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
rename to web/app/components/datasets/list/dataset-card/components/operations-menu.tsx
index 2e3296be337..dd163081f8a 100644
--- a/web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
+++ b/web/app/components/datasets/list/dataset-card/components/operations-menu.tsx
@@ -1,27 +1,21 @@
import type { DatasetCardItem } from '../types'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import {
- getStepByStepTourDropdownMenuContentProps,
- useStepByStepTourControlledDropdown,
-} from '@/app/components/step-by-step-tour/dropdown-menu'
+ getStepByStepTourMenuContentProps,
+ useStepByStepTourControlledMenu,
+} from '@/app/components/step-by-step-tour/menu'
import { workspacePermissionKeysAtom } from '@/context/permission-state'
import { userProfileQueryOptions } from '@/features/account-profile/client'
import { useKnowledgeUpgrade } from '@/features/new-rag/upgrade/knowledge-upgrade-context-value'
import { systemFeaturesQueryOptions } from '@/features/system-features/client'
import { getDatasetACLCapabilities } from '@/utils/permission'
-type OperationsDropdownProps = {
+type OperationsMenuProps = {
dataset: DatasetCardItem
openRenameModal: () => void
handleExportPipeline: (include?: boolean) => void
@@ -31,7 +25,7 @@ type OperationsDropdownProps = {
stepByStepTourOpen?: boolean
}
-const OperationsDropdown = ({
+const OperationsMenu = ({
dataset,
openRenameModal,
handleExportPipeline,
@@ -39,8 +33,8 @@ const OperationsDropdown = ({
openAccessConfig,
stepByStepTourHighlightPart,
stepByStepTourOpen,
-}: OperationsDropdownProps) => {
- const operationsMenu = useStepByStepTourControlledDropdown({
+}: OperationsMenuProps) => {
+ const operationsMenu = useStepByStepTourControlledMenu({
allowTriggerCloseWhileControlled: false,
controlledOpen: stepByStepTourOpen,
})
@@ -96,8 +90,8 @@ const OperationsDropdown = ({
: 'pointer-events-none opacity-0 group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100 [@media(hover:none)]:pointer-events-auto [@media(hover:none)]:opacity-100',
)}
>
- <DropdownMenu modal={false} open={open} onOpenChange={setOpen}>
- <DropdownMenuTrigger
+ <Menu modal={false} open={open} onOpenChange={setOpen}>
+ <MenuTrigger
ref={triggerRef}
className={cn(
'inline-flex size-9 cursor-pointer items-center justify-center rounded-[10px] border-[0.5px]',
@@ -109,9 +103,10 @@ const OperationsDropdown = ({
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
>
<span aria-hidden className="i-ri-more-fill size-5 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent
- {...getStepByStepTourDropdownMenuContentProps({
+ </MenuTrigger>
+ <MenuContent
+ align="end"
+ {...getStepByStepTourMenuContentProps({
highlightPart: stepByStepTourHighlightPart,
interactionMode: operationsMenu.controlled ? 'presentation' : 'interactive',
className: 'min-w-44',
@@ -119,47 +114,47 @@ const OperationsDropdown = ({
>
{canUpgrade && (
<>
- <DropdownMenuItem
+ <MenuItem
className="gap-2 text-text-accent"
onClick={() => knowledgeUpgrade.requestUpgrade(dataset, triggerRef)}
>
<span aria-hidden className="i-ri-arrow-up-circle-line size-4" />
{t(($) => $['upgrade.menuLabel'], { ns: 'knowledgeUpgrade' })}
- </DropdownMenuItem>
- <DropdownMenuSeparator />
+ </MenuItem>
+ <MenuSeparator />
</>
)}
{datasetACLCapabilities.canEdit && (
- <DropdownMenuItem className="gap-2" onClick={openRenameModal}>
+ <MenuItem className="gap-2" onClick={openRenameModal}>
<span aria-hidden className="i-ri-edit-line size-4 text-text-tertiary" />
{t(($) => $['operation.edit'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{dataset.runtime_mode === 'rag_pipeline' && datasetACLCapabilities.canImportExportDSL && (
- <DropdownMenuItem className="gap-2" onClick={() => handleExportPipeline()}>
+ <MenuItem className="gap-2" onClick={() => handleExportPipeline()}>
<span aria-hidden className="i-ri-file-download-line size-4 text-text-tertiary" />
{t(($) => $['operations.exportPipeline'], { ns: 'datasetPipeline' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{datasetACLCapabilities.canAccessConfig && (
- <DropdownMenuItem className="gap-2" onClick={openAccessConfig}>
+ <MenuItem className="gap-2" onClick={openAccessConfig}>
<span aria-hidden className="i-ri-lock-line size-4 text-text-tertiary" />
{t(($) => $['settings.resourceAccess'], { ns: 'navigation' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{datasetACLCapabilities.canDelete && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem className="gap-2" variant="destructive" onClick={onDelete}>
+ <MenuSeparator />
+ <MenuItem className="gap-2" variant="destructive" onClick={onDelete}>
<span aria-hidden className="i-ri-delete-bin-line size-4" />
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
)
}
-export default React.memo(OperationsDropdown)
+export default React.memo(OperationsMenu)
diff --git a/web/app/components/datasets/list/dataset-card/index.tsx b/web/app/components/datasets/list/dataset-card/index.tsx
index 1f24e609c44..b523c1b7bc6 100644
--- a/web/app/components/datasets/list/dataset-card/index.tsx
+++ b/web/app/components/datasets/list/dataset-card/index.tsx
@@ -21,7 +21,7 @@ import CornerLabels from './components/corner-labels'
import DatasetCardFooter from './components/dataset-card-footer'
import DatasetCardHeader from './components/dataset-card-header'
import Description from './components/description'
-import OperationsDropdown from './components/operations-dropdown'
+import OperationsMenu from './components/operations-menu'
import { useDatasetCardActions } from './hooks/use-dataset-card-actions'
const EXTERNAL_PROVIDER = 'external'
@@ -140,7 +140,7 @@ const DatasetCard = ({
/>
<DatasetCardFooter dataset={dataset} />
{!isPreviewOnly && (
- <OperationsDropdown
+ <OperationsMenu
dataset={dataset}
openRenameModal={() => setRenameOpen(true)}
handleExportPipeline={handleExportPipeline}
diff --git a/web/app/components/datasets/list/header.tsx b/web/app/components/datasets/list/header.tsx
index 8c0c72a6506..7c8180fdd50 100644
--- a/web/app/components/datasets/list/header.tsx
+++ b/web/app/components/datasets/list/header.tsx
@@ -2,21 +2,15 @@
import type { KnowledgeViewSwitcherProps } from '@/features/new-rag/list/knowledge-view-switcher'
import { Button } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import { SearchInput } from '@/app/components/base/search-input'
import CheckboxWithLabel from '@/app/components/datasets/create/website/base/checkbox-with-label'
import { CreatorFilter } from '@/app/components/datasets/creator-filter'
import {
- getStepByStepTourDropdownMenuContentProps,
- useStepByStepTourControlledDropdown,
-} from '@/app/components/step-by-step-tour/dropdown-menu'
+ getStepByStepTourMenuContentProps,
+ useStepByStepTourControlledMenu,
+} from '@/app/components/step-by-step-tour/menu'
import { KnowledgeViewSwitcher } from '@/features/new-rag/list/knowledge-view-switcher'
import { TagFilter } from '@/features/tag-management/components/tag-filter'
import { ServiceApi } from '../extra-info/service-api'
@@ -70,7 +64,7 @@ const DatasetListHeader = ({
}: Props) => {
const { t } = useTranslation(['common', 'dataset'])
const showCreateMenu = canCreateDataset || canConnectExternalDataset
- const createMenu = useStepByStepTourControlledDropdown({
+ const createMenu = useStepByStepTourControlledMenu({
controlledOpen: stepByStepTourCreateMenuOpen,
})
@@ -135,12 +129,8 @@ const DatasetListHeader = ({
</div>
<div className="flex items-center gap-2">
{showCreateMenu && (
- <DropdownMenu
- modal={false}
- open={createMenu.open}
- onOpenChange={createMenu.onOpenChange}
- >
- <DropdownMenuTrigger
+ <Menu modal={false} open={createMenu.open} onOpenChange={createMenu.onOpenChange}>
+ <MenuTrigger
render={
<Button
variant="primary"
@@ -154,8 +144,9 @@ const DatasetListHeader = ({
</Button>
}
/>
- <DropdownMenuContent
- {...getStepByStepTourDropdownMenuContentProps({
+ <MenuContent
+ align="end"
+ {...getStepByStepTourMenuContentProps({
disableMotion: createMenu.controlled,
highlightPart: createMenu.controlled
? stepByStepTourCreateMenuHighlightPart
@@ -166,7 +157,7 @@ const DatasetListHeader = ({
>
{canCreateDataset && (
<>
- <DropdownMenuItem
+ <MenuItem
className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
onClick={onCreateDataset}
>
@@ -177,8 +168,8 @@ const DatasetListHeader = ({
<span className="min-w-0 flex-1 truncate px-1">
{t(($) => $['firstEmpty.createTitle'], { ns: 'dataset' })}
</span>
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
onClick={onCreateFromPipeline}
>
@@ -189,14 +180,14 @@ const DatasetListHeader = ({
<span className="min-w-0 flex-1 truncate px-1">
{t(($) => $['firstEmpty.pipelineTitle'], { ns: 'dataset' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
{canCreateDataset && canConnectExternalDataset && (
- <DropdownMenuSeparator className="my-1" />
+ <MenuSeparator className="my-1" />
)}
{canConnectExternalDataset && (
- <DropdownMenuItem
+ <MenuItem
className="h-8 gap-1 rounded-lg px-2 py-1 system-md-regular text-text-secondary"
onClick={onConnectDataset}
>
@@ -207,10 +198,10 @@ const DatasetListHeader = ({
<span className="min-w-0 flex-1 truncate px-1">
{t(($) => $.connectDataset, { ns: 'dataset' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)}
</div>
</div>
diff --git a/web/app/components/explore/item-operation/index.tsx b/web/app/components/explore/item-operation/index.tsx
index 8cbe7771936..e17d66b05e5 100644
--- a/web/app/components/explore/item-operation/index.tsx
+++ b/web/app/components/explore/item-operation/index.tsx
@@ -1,11 +1,6 @@
'use client'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import s from './style.module.css'
@@ -31,8 +26,8 @@ function ItemOperation({
const { t: tCommon } = useTranslation(['common'])
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={tCommon(($) => $['operation.moreActionsFor'], { name: itemName })}
className={cn(
'group/operation flex size-6 items-center justify-center rounded-md border-none p-0 text-text-tertiary transition-colors group-focus-within:bg-components-actionbar-bg! group-hover:bg-components-actionbar-bg! hover:bg-state-base-hover focus-visible:bg-state-base-hover data-popup-open:bg-components-actionbar-bg! data-popup-open:shadow-none!',
@@ -46,9 +41,9 @@ function ItemOperation({
aria-hidden
className="i-ri-more-fill size-4 opacity-0 transition-opacity group-focus-within:opacity-100 group-hover:opacity-100 group-focus-visible/operation:opacity-100 group-data-popup-open/operation:opacity-100"
/>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="min-w-30">
- <DropdownMenuItem
+ </MenuTrigger>
+ <MenuContent align="end" className="min-w-30">
+ <MenuItem
className={cn(s.actionItem, 'gap-2 px-3')}
onClick={(e) => {
e.stopPropagation()
@@ -62,9 +57,9 @@ function ItemOperation({
<span className={s.actionName}>
{isPinned ? t(($) => $['sidebar.action.unpin']) : t(($) => $['sidebar.action.pin'])}
</span>
- </DropdownMenuItem>
+ </MenuItem>
{isShowRenameConversation && (
- <DropdownMenuItem
+ <MenuItem
className={cn(s.actionItem, 'gap-2 px-3')}
onClick={(e) => {
e.stopPropagation()
@@ -73,10 +68,10 @@ function ItemOperation({
>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-secondary" />
<span className={s.actionName}>{t(($) => $['sidebar.action.rename'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
export default React.memo(ItemOperation)
diff --git a/web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx b/web/app/components/header/account-menu/__tests__/compliance.spec.tsx
similarity index 96%
rename from web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx
rename to web/app/components/header/account-menu/__tests__/compliance.spec.tsx
index b75863ee314..c4ca419d9bc 100644
--- a/web/app/components/header/account-dropdown/__tests__/compliance.spec.tsx
+++ b/web/app/components/header/account-menu/__tests__/compliance.spec.tsx
@@ -1,8 +1,4 @@
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuTrigger } from '@langgenius/dify-ui/menu'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { fireEvent, render as renderWithoutPricing, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
@@ -65,12 +61,12 @@ describe('Compliance', () => {
const renderCompliance = () => {
return renderWithQueryClient(
- <DropdownMenu open={true} onOpenChange={() => {}}>
- <DropdownMenuTrigger>open</DropdownMenuTrigger>
- <DropdownMenuContent>
+ <Menu open={true} onOpenChange={() => {}}>
+ <MenuTrigger>open</MenuTrigger>
+ <MenuContent>
<Compliance />
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuContent>
+ </Menu>,
)
}
diff --git a/web/app/components/header/account-dropdown/__tests__/focus.browser.spec.tsx b/web/app/components/header/account-menu/__tests__/focus.browser.spec.tsx
similarity index 95%
rename from web/app/components/header/account-dropdown/__tests__/focus.browser.spec.tsx
rename to web/app/components/header/account-menu/__tests__/focus.browser.spec.tsx
index 380cff69742..43a7ac13b72 100644
--- a/web/app/components/header/account-dropdown/__tests__/focus.browser.spec.tsx
+++ b/web/app/components/header/account-menu/__tests__/focus.browser.spec.tsx
@@ -10,7 +10,7 @@ import {
import AccountSection from '@/app/components/main-nav/components/account-section'
import { createConsoleQueryWrapper } from '@/test/console/query-data'
import { createNuqsTestWrapper } from '@/test/nuqs-testing'
-import AccountDropdown from '../index'
+import AccountMenu from '../index'
vi.mock('@/service/use-common', () => ({ useLogout: () => ({ mutate: vi.fn() }) }))
vi.mock('next-themes', () => ({
@@ -69,7 +69,7 @@ it.each(['ltr', 'rtl'] as const)(
<ConsoleProvider>
<NuqsProvider>
<div style={{ marginInline: 'auto', paddingTop: 300, width: 240 }}>
- <AccountDropdown
+ <AccountMenu
trigger={({ ariaLabel }) => <button aria-label={ariaLabel}>Account</button>}
/>
</div>
@@ -81,7 +81,7 @@ it.each(['ltr', 'rtl'] as const)(
const appearance = screen.getByRole('menuitem', {
name: 'accountSettings.account.appearanceLabel',
})
- await appearance.click()
+ await userEvent.hover(appearance)
const submenu = screen.getByRole('menu', { name: 'accountSettings.account.appearanceLabel' })
await expect.element(submenu).toBeVisible()
// Leave room on both sides so collision fallback cannot hide a fixed-side override.
@@ -94,6 +94,12 @@ it.each(['ltr', 'rtl'] as const)(
: submenuBounds.left >= triggerBounds.right
})
.toBe(true)
+ await userEvent.hover(
+ screen.getByRole('menuitemradio', { name: 'accountSettings.account.appearanceLight' }),
+ )
+ await expect.element(submenu).toBeVisible()
+ await userEvent.keyboard('{Escape}')
+ await expect.element(appearance).toHaveFocus()
} finally {
document.documentElement.dir = previousDirection
}
diff --git a/web/app/components/header/account-dropdown/__tests__/index.spec.tsx b/web/app/components/header/account-menu/__tests__/index.spec.tsx
similarity index 95%
rename from web/app/components/header/account-dropdown/__tests__/index.spec.tsx
rename to web/app/components/header/account-menu/__tests__/index.spec.tsx
index 926027741ca..024bb7433ec 100644
--- a/web/app/components/header/account-dropdown/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-menu/__tests__/index.spec.tsx
@@ -8,7 +8,7 @@ import { useLogout } from '@/service/use-common'
import { createAccountProfileQueryClient } from '@/test/console/account-profile'
import { renderWithConsoleQuery as renderWithConsoleQueryWithoutUrlState } from '@/test/console/query-data'
import { createNuqsTestRenderer } from '@/test/nuqs-testing'
-import AccountDropdown from '../index'
+import AccountMenu from '../index'
vi.mock('@/service/use-common', async (importOriginal) => ({
...(await importOriginal<typeof import('@/service/use-common')>()),
@@ -33,11 +33,11 @@ const renderWithConsoleQuery = createNuqsTestRenderer(
() => ({ onUrlUpdate }),
)
-const renderAccountDropdown = () => {
+const renderAccountMenu = () => {
const queryClient = createAccountProfileQueryClient(userProfile)
return renderWithConsoleQuery(
- <AccountDropdown
+ <AccountMenu
trigger={({ ariaLabel }) => (
<button type="button" aria-label={ariaLabel}>
Current account
@@ -48,7 +48,7 @@ const renderAccountDropdown = () => {
)
}
-describe('AccountDropdown', () => {
+describe('AccountMenu', () => {
const mockLogout = vi.fn()
beforeEach(() => {
@@ -88,7 +88,7 @@ describe('AccountDropdown', () => {
it('keeps the composed trigger disabled in server-rendered markup', () => {
const html = renderToString(
- <AccountDropdown
+ <AccountMenu
trigger={({ ariaLabel }) => (
<button type="button" aria-label={ariaLabel}>
Current account
@@ -106,7 +106,7 @@ describe('AccountDropdown', () => {
it('opens preferences from the account menu', async () => {
const user = userEvent.setup()
- renderAccountDropdown()
+ renderAccountMenu()
await user.click(screen.getByRole('button', { name: 'accountSettings.account.account' }))
await user.click(await screen.findByText('navigation.settings.preferences'))
@@ -121,7 +121,7 @@ describe('AccountDropdown', () => {
async (surface) => {
const user = userEvent.setup()
if (surface === 'main navigation') {
- renderAccountDropdown()
+ renderAccountMenu()
} else {
renderWithConsoleQuery(
surface === 'account page' ? <AccountAvatar /> : <EducationUserInfo />,
diff --git a/web/app/components/header/account-dropdown/compliance.tsx b/web/app/components/header/account-menu/compliance.tsx
similarity index 92%
rename from web/app/components/header/account-dropdown/compliance.tsx
rename to web/app/components/header/account-menu/compliance.tsx
index fb78893fba5..db24e9ae9f8 100644
--- a/web/app/components/header/account-dropdown/compliance.tsx
+++ b/web/app/components/header/account-menu/compliance.tsx
@@ -2,12 +2,12 @@ import type { CloudPlan } from '@dify/contracts/api/console/features/types.gen'
import type { ReactNode } from 'react'
import { buttonVariants } from '@langgenius/dify-ui/button'
import {
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ MenuContent,
+ MenuGroup,
+ MenuItem,
+ MenuSubmenu,
+ MenuSubmenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { useMutation, useQuery } from '@tanstack/react-query'
import { useQueryState } from 'nuqs'
@@ -167,7 +167,7 @@ function ComplianceDocRowItem({ icon, label, docName }: ComplianceDocRowItemProp
if (docName !== DocName.GDPR && plan === undefined) return null
return (
- <DropdownMenuItem
+ <MenuItem
className="h-10 justify-between py-1 pr-2 pl-1"
closeOnClick={!isCurrentPlanCanDownload}
disabled={isPending}
@@ -184,24 +184,24 @@ function ComplianceDocRowItem({ icon, label, docName }: ComplianceDocRowItemProp
downloadText={t(($) => $['operation.download'], { ns: 'common' })}
upgradeText={t(($) => $['upgradeBtn.encourageShort'], { ns: 'billing' })}
/>
- </DropdownMenuItem>
+ </MenuItem>
)
}
-// Submenu-only: this component must be rendered within an existing DropdownMenu root.
+// Submenu-only: this component must be rendered within an existing Menu root.
export default function Compliance() {
const { t } = useTranslation(['common'])
return (
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="mx-0 h-8 gap-1 px-3 py-1">
+ <MenuSubmenu>
+ <MenuSubmenuTrigger className="h-8 gap-1 px-3 py-1">
<MenuItemContent
iconClassName="i-ri-verified-badge-line"
label={t(($) => $['userProfile.compliance'], { ns: 'common' })}
/>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent className="w-84.25 divide-y divide-divider-subtle bg-components-panel-bg-blur! py-0! backdrop-blur-xs">
- <DropdownMenuGroup className="py-1">
+ </MenuSubmenuTrigger>
+ <MenuContent className="w-84.25 divide-y divide-divider-subtle bg-components-panel-bg-blur! py-0! backdrop-blur-xs">
+ <MenuGroup className="py-1">
<ComplianceDocRowItem
icon={<span aria-hidden className="i-custom-public-common-soc2 size-7 shrink-0" />}
label={t(($) => $['compliance.soc2Type1'], { ns: 'common' })}
@@ -222,8 +222,8 @@ export default function Compliance() {
label={t(($) => $['compliance.gdpr'], { ns: 'common' })}
docName={DocName.GDPR}
/>
- </DropdownMenuGroup>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ </MenuGroup>
+ </MenuContent>
+ </MenuSubmenu>
)
}
diff --git a/web/app/components/header/account-dropdown/index.tsx b/web/app/components/header/account-menu/index.tsx
similarity index 79%
rename from web/app/components/header/account-dropdown/index.tsx
rename to web/app/components/header/account-menu/index.tsx
index 315ed62282d..ae75333f90e 100644
--- a/web/app/components/header/account-dropdown/index.tsx
+++ b/web/app/components/header/account-menu/index.tsx
@@ -5,20 +5,19 @@ import type { Theme } from '@/app/components/base/theme-selector'
import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuSeparator,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuSeparator,
+ MenuSubmenu,
+ MenuSubmenuTrigger,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
import { useTheme } from 'next-themes'
import { useQueryState } from 'nuqs'
@@ -36,7 +35,7 @@ import { useLogout } from '@/service/use-common'
import { getAvatarInitial } from '@/utils/avatar'
import { ExternalLinkIndicator, MenuItemContent } from './menu-item-content'
-type AccountDropdownProps = {
+type AccountMenuProps = {
trigger: (props: { ariaLabel: string }) => ReactElement
}
@@ -65,7 +64,7 @@ function MainNavRadioItemContent({ iconClassName, label }: MainNavRadioItemConte
>
{label}
</span>
- <DropdownMenuRadioItemIndicator />
+ <MenuRadioItemIndicator />
</>
)
}
@@ -77,39 +76,39 @@ function AppearanceSubmenu() {
theme === 'light' || theme === 'dark' || theme === 'system' ? theme : 'system'
return (
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className="mx-0 px-3 py-1">
+ <MenuSubmenu>
+ <MenuSubmenuTrigger className="px-3 py-1">
<MenuItemContent
iconClassName="i-ri-sun-line"
label={t(($) => $['account.appearanceLabel'], { ns: 'accountSettings' })}
/>
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent sideOffset={6} className="max-h-90 w-34.75 px-1">
- <DropdownMenuRadioGroup<Theme>
+ </MenuSubmenuTrigger>
+ <MenuContent className="max-h-90 w-34.75">
+ <MenuRadioGroup<Theme>
value={currentTheme}
onValueChange={(nextTheme) => setTheme(nextTheme)}
>
- <DropdownMenuRadioItem<Theme> value="light" className="mx-0 py-1">
+ <MenuRadioItem<Theme> value="light" className="py-1">
<MainNavRadioItemContent
iconClassName="i-ri-sun-line"
label={t(($) => $['account.appearanceLight'], { ns: 'accountSettings' })}
/>
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<Theme> value="dark" className="mx-0 py-1">
+ </MenuRadioItem>
+ <MenuRadioItem<Theme> value="dark" className="py-1">
<MainNavRadioItemContent
iconClassName="i-ri-moon-line"
label={t(($) => $['account.appearanceDark'], { ns: 'accountSettings' })}
/>
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<Theme> value="system" className="mx-0 py-1">
+ </MenuRadioItem>
+ <MenuRadioItem<Theme> value="system" className="py-1">
<MainNavRadioItemContent
iconClassName="i-ri-computer-line"
label={t(($) => $['account.appearanceSystem'], { ns: 'accountSettings' })}
/>
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- </DropdownMenuSubContent>
- </DropdownMenuSub>
+ </MenuRadioItem>
+ </MenuRadioGroup>
+ </MenuContent>
+ </MenuSubmenu>
)
}
@@ -138,8 +137,8 @@ function MainNavMenuContent({ onLogout }: MainNavMenuContentProps) {
return (
<>
- <DropdownMenuGroup className="p-1">
- <div className="flex items-center gap-3 rounded-xl bg-linear-to-b from-background-section-burn to-background-section p-3">
+ <MenuGroup className="py-1">
+ <div className="mx-1 flex items-center gap-3 rounded-xl bg-linear-to-b from-background-section-burn to-background-section p-3">
<div className="flex min-w-0 grow flex-col gap-1">
<div className="flex min-w-0 items-center gap-1">
<div
@@ -167,33 +166,27 @@ function MainNavMenuContent({ onLogout }: MainNavMenuContentProps) {
<AvatarImage src={userProfile.avatar_url || undefined} alt="" />
</Avatar>
</div>
- </DropdownMenuGroup>
- <DropdownMenuGroup className="p-1">
- <DropdownMenuLinkItem
- className="mx-0 justify-between px-3 py-1"
- render={<Link href="/account" />}
- >
+ </MenuGroup>
+ <MenuGroup className="py-1">
+ <MenuLinkItem className="justify-between px-3 py-1" render={<Link href="/account" />}>
<MenuItemContent
iconClassName="i-ri-account-circle-line"
label={t(($) => $['account.account'], { ns: 'accountSettings' })}
trailing={<ExternalLinkIndicator />}
/>
- </DropdownMenuLinkItem>
- <DropdownMenuItem
- className="mx-0 px-3 py-1"
- onClick={() => setSettingsDestination('preferences')}
- >
+ </MenuLinkItem>
+ <MenuItem className="px-3 py-1" onClick={() => setSettingsDestination('preferences')}>
<MenuItemContent
iconClassName="i-ri-equalizer-2-line"
label={t(($) => $['settings.preferences'], { ns: 'navigation' })}
/>
- </DropdownMenuItem>
+ </MenuItem>
<AppearanceSubmenu />
- </DropdownMenuGroup>
- <DropdownMenuSeparator className="my-0" />
- <DropdownMenuGroup className="p-1">
- <DropdownMenuItem
- className="mx-0 px-3 py-1"
+ </MenuGroup>
+ <MenuSeparator className="my-0" />
+ <MenuGroup className="py-1">
+ <MenuItem
+ className="px-3 py-1"
onClick={() => {
onLogout()
}}
@@ -202,13 +195,13 @@ function MainNavMenuContent({ onLogout }: MainNavMenuContentProps) {
iconClassName="i-ri-shut-down-line"
label={t(($) => $['userProfile.logout'], { ns: 'common' })}
/>
- </DropdownMenuItem>
- </DropdownMenuGroup>
+ </MenuItem>
+ </MenuGroup>
</>
)
}
-export default function AccountDropdown({ trigger }: AccountDropdownProps) {
+export default function AccountMenu({ trigger }: AccountMenuProps) {
const triggerRef = useRef<HTMLButtonElement>(null)
const popupRef = useRef<HTMLDivElement>(null)
const keyboardNavigationRef = useRef(false)
@@ -223,7 +216,7 @@ export default function AccountDropdown({ trigger }: AccountDropdownProps) {
return (
<div>
- <DropdownMenu
+ <Menu
onOpenChange={(open, { event }) => {
if (open)
keyboardNavigationRef.current =
@@ -231,7 +224,7 @@ export default function AccountDropdown({ trigger }: AccountDropdownProps) {
(event.type === 'click' && 'detail' in event && event.detail === 0)
}}
>
- <DropdownMenuTrigger
+ <MenuTrigger
ref={triggerRef}
onKeyDownCapture={(event) => {
if (event.key !== 'Escape') keyboardNavigationRef.current = true
@@ -241,7 +234,7 @@ export default function AccountDropdown({ trigger }: AccountDropdownProps) {
ariaLabel: t(($) => $['account.account'], { ns: 'accountSettings' }),
})}
/>
- <DropdownMenuContent
+ <MenuContent
ref={popupRef}
onKeyDownCapture={(event) => {
if (event.key !== 'Escape') keyboardNavigationRef.current = true
@@ -277,13 +270,13 @@ export default function AccountDropdown({ trigger }: AccountDropdownProps) {
}}
side="top"
align="start"
- sideOffset={6}
+
alignOffset={4}
className={mainNavMenuPopupClassName}
>
<MainNavMenuContent onLogout={() => logout()} />
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
)
}
diff --git a/web/app/components/header/account-dropdown/menu-item-content.tsx b/web/app/components/header/account-menu/menu-item-content.tsx
similarity index 100%
rename from web/app/components/header/account-dropdown/menu-item-content.tsx
rename to web/app/components/header/account-menu/menu-item-content.tsx
diff --git a/web/app/components/header/account-dropdown/workplace-selector/index.tsx b/web/app/components/header/account-menu/workplace-selector/index.tsx
similarity index 100%
rename from web/app/components/header/account-dropdown/workplace-selector/index.tsx
rename to web/app/components/header/account-menu/workplace-selector/index.tsx
diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx
index 4cf8068bb6a..15f1edac2cf 100644
--- a/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx
@@ -11,14 +11,8 @@ import {
AlertDialogHeader,
AlertDialogTitle,
} from '@langgenius/dify-ui/alert-dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation } from '@tanstack/react-query'
import { useCallback, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -76,8 +70,8 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) =>
return (
<>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
size="lg"
@@ -88,39 +82,33 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) =>
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-35">
+ <MenuContent align="end" className="min-w-35">
{isBuiltIn ? (
- <DropdownMenuItem
- className="system-sm-semibold text-text-secondary"
- onClick={handleView}
- >
+ <MenuItem className="system-sm-semibold text-text-secondary" onClick={handleView}>
{t(($) => $['operation.view'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
) : (
- <DropdownMenuItem className="system-sm-semibold text-text-secondary" onClick={onEdit}>
+ <MenuItem className="system-sm-semibold text-text-secondary" onClick={onEdit}>
{t(($) => $['operation.edit'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- <DropdownMenuItem
- className="system-sm-semibold text-text-secondary"
- onClick={handleCopyRules}
- >
+ <MenuItem className="system-sm-semibold text-text-secondary" onClick={handleCopyRules}>
{t(($) => $['common.duplicateAction'], { ns: 'permission' })}
- </DropdownMenuItem>
+ </MenuItem>
{!isBuiltIn && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ <MenuSeparator />
+ <MenuItem
variant="destructive"
className="system-sm-semibold"
onClick={openDeleteConfirm}
>
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<AlertDialog
open={showDeleteConfirm}
onOpenChange={(open) => !open && setShowDeleteConfirm(false)}
diff --git a/web/app/components/header/account-setting/data-source-page-new/operator.tsx b/web/app/components/header/account-setting/data-source-page-new/operator.tsx
index dd5cb600774..e6c8303c003 100644
--- a/web/app/components/header/account-setting/data-source-page-new/operator.tsx
+++ b/web/app/components/header/account-setting/data-source-page-new/operator.tsx
@@ -1,13 +1,7 @@
import type { DatasourceCredentialResponse } from '@dify/contracts/api/console/auth/types.gen'
import type { Ref } from 'react'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { memo, useCallback } from 'react'
import { useTranslation } from 'react-i18next'
import { CredentialTypeEnum } from '@/app/components/plugins/plugin-auth/types'
@@ -46,8 +40,8 @@ const Operator = ({
)
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
ref={triggerRef}
@@ -59,8 +53,8 @@ const Operator = ({
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-50">
- <DropdownMenuItem
+ <MenuContent align="end" className="min-w-50">
+ <MenuItem
disabled={!canUseCredential}
className="h-auto gap-2 py-2"
onClick={() => handleAction('setDefault', canUseCredential)}
@@ -69,9 +63,9 @@ const Operator = ({
<div className="system-sm-semibold text-text-secondary">
{t(($) => $['auth.setDefault'], { ns: 'plugin' })}
</div>
- </DropdownMenuItem>
+ </MenuItem>
{type === CredentialTypeEnum.OAUTH2 && (
- <DropdownMenuItem
+ <MenuItem
disabled={!canManageCredential}
className="h-auto gap-2 py-2"
onClick={() => handleAction('rename', canManageCredential)}
@@ -80,10 +74,10 @@ const Operator = ({
<div className="system-sm-semibold text-text-secondary">
{t(($) => $['operation.rename'], { ns: 'common' })}
</div>
- </DropdownMenuItem>
+ </MenuItem>
)}
{type === CredentialTypeEnum.API_KEY && (
- <DropdownMenuItem
+ <MenuItem
disabled={!canManageCredential}
className="h-auto gap-2 py-2"
onClick={() => handleAction('edit', canManageCredential)}
@@ -92,10 +86,10 @@ const Operator = ({
<div className="system-sm-semibold text-text-secondary">
{t(($) => $['operation.edit'], { ns: 'common' })}
</div>
- </DropdownMenuItem>
+ </MenuItem>
)}
{type === CredentialTypeEnum.OAUTH2 && (
- <DropdownMenuItem
+ <MenuItem
disabled={!canManageCredential}
className="h-auto gap-2 py-2"
onClick={() => handleAction('change', canManageCredential)}
@@ -104,10 +98,10 @@ const Operator = ({
<div className="mb-1 system-sm-semibold text-text-secondary">
{t(($) => $['dataSource.notion.changeAuthorizedPages'], { ns: 'common' })}
</div>
- </DropdownMenuItem>
+ </MenuItem>
)}
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ <MenuSeparator />
+ <MenuItem
disabled={!canManageCredential}
variant="destructive"
className="h-auto gap-2 py-2"
@@ -117,9 +111,9 @@ const Operator = ({
<div className="system-sm-semibold">
{t(($) => $['operation.remove'], { ns: 'common' })}
</div>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/header/account-setting/data-source-page-new/plugin-actions.tsx b/web/app/components/header/account-setting/data-source-page-new/plugin-actions.tsx
index 124b1128d29..82f9dd74969 100644
--- a/web/app/components/header/account-setting/data-source-page-new/plugin-actions.tsx
+++ b/web/app/components/header/account-setting/data-source-page-new/plugin-actions.tsx
@@ -4,13 +4,13 @@ import type { PluginVersionsResponse } from '@dify/contracts/marketplace'
import type { PluginDetail } from '@/app/components/plugins/types'
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { skipToken, useQuery } from '@tanstack/react-query'
import { memo, useId } from 'react'
@@ -22,7 +22,7 @@ import {
useDetailHeaderState,
usePluginOperations,
} from '@/app/components/plugins/plugin-detail-panel/detail-header/hooks'
-import { OperationDropdown } from '@/app/components/plugins/plugin-detail-panel/operation-dropdown'
+import { OperationMenu } from '@/app/components/plugins/plugin-detail-panel/operation-menu'
import { usePluginSettingsAccess } from '@/app/components/plugins/plugin-page/use-reference-setting'
import { useReadmePanelStore } from '@/app/components/plugins/readme-panel/store'
import { PluginSource } from '@/app/components/plugins/types'
@@ -126,7 +126,7 @@ const DataSourcePluginActions = ({ detail, onUpdate }: Props) => {
return (
<div className="flex shrink-0 items-center gap-1">
- <DropdownMenu
+ <Menu
open={
!!displayVersion &&
versionPicker.isShow &&
@@ -137,7 +137,7 @@ const DataSourcePluginActions = ({ detail, onUpdate }: Props) => {
onOpenChange={versionPicker.setIsShow}
>
{!!displayVersion && (
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<Button
variant="ghost"
@@ -158,18 +158,18 @@ const DataSourcePluginActions = ({ detail, onUpdate }: Props) => {
}
/>
)}
- <DropdownMenuContent
+ <MenuContent
className="max-h-[min(16rem,var(--available-height))]"
align="start"
aria-labelledby={versionMenuLabelId}
>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel id={versionMenuLabelId}>
+ <MenuGroup>
+ <MenuGroupLabel id={versionMenuLabelId}>
{t(($) => $['detailPanel.switchVersion'], { ns: 'plugin' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{versionsQuery.data && autoUpgradeSettings.data ? (
versionsQuery.data.data.versions.map((item) => (
- <DropdownMenuItem
+ <MenuItem
key={item.unique_identifier}
disabled={detail.version === item.version}
onClick={() => handleVersionSelect(item)}
@@ -181,10 +181,10 @@ const DataSourcePluginActions = ({ detail, onUpdate }: Props) => {
<span className="ms-auto text-text-tertiary">
{formatDate(item.created_at, dateFormat)}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))
) : (
- <DropdownMenuItem
+ <MenuItem
closeOnClick={false}
onClick={() => {
if (versionsQuery.isError) void versionsQuery.refetch()
@@ -192,11 +192,11 @@ const DataSourcePluginActions = ({ detail, onUpdate }: Props) => {
}}
>
{t(($) => $['operation.retry'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
{canUpdatePlugin && (hasNewVersion || isFromGitHub) && (
<Tooltip>
<TooltipTrigger
@@ -218,7 +218,7 @@ const DataSourcePluginActions = ({ detail, onUpdate }: Props) => {
</TooltipContent>
</Tooltip>
)}
- <OperationDropdown
+ <OperationMenu
triggerAriaLabel={t(($) => $['operation.moreActionsFor'], {
ns: 'common',
name: pluginLabel,
diff --git a/web/app/components/header/account-setting/ip-policies-page/policy-item.tsx b/web/app/components/header/account-setting/ip-policies-page/policy-item.tsx
index 913f398cc9e..f4294b6a0d7 100644
--- a/web/app/components/header/account-setting/ip-policies-page/policy-item.tsx
+++ b/web/app/components/header/account-setting/ip-policies-page/policy-item.tsx
@@ -13,14 +13,8 @@ import {
AlertDialogTitle,
} from '@langgenius/dify-ui/alert-dialog'
import { Button } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { useMutation } from '@tanstack/react-query'
import { useState } from 'react'
@@ -121,11 +115,11 @@ export function PolicyItem({ group, canMutate, onView, onEdit }: PolicyItemProps
</div>
<div role="cell" className={`${policyActionsColClassName} pointer-events-none relative`}>
{canMutate && (
- <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>
+ <Menu open={menuOpen} onOpenChange={setMenuOpen}>
<Tooltip>
<TooltipTrigger
render={
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<IconButton
size="md"
@@ -145,8 +139,8 @@ export function PolicyItem({ group, canMutate, onView, onEdit }: PolicyItemProps
{t(($) => $['settings.ipPolicyMore'], { ns: 'common' })}
</TooltipContent>
</Tooltip>
- <DropdownMenuContent className="min-w-35">
- <DropdownMenuItem
+ <MenuContent align="end" className="min-w-35">
+ <MenuItem
disabled={!canMutate}
className="system-sm-semibold text-text-secondary"
onClick={() => {
@@ -155,9 +149,9 @@ export function PolicyItem({ group, canMutate, onView, onEdit }: PolicyItemProps
}}
>
{t(($) => $['operation.edit'], { ns: 'common' })}
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ </MenuItem>
+ <MenuSeparator />
+ <MenuItem
disabled={!canMutate}
variant="destructive"
className="system-sm-semibold"
@@ -172,9 +166,9 @@ export function PolicyItem({ group, canMutate, onView, onEdit }: PolicyItemProps
}}
>
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
</div>
<AlertDialog
diff --git a/web/app/components/header/account-setting/members-page/member-menu.tsx b/web/app/components/header/account-setting/members-page/member-menu.tsx
index ec871e33217..6c2afcb3cb1 100644
--- a/web/app/components/header/account-setting/members-page/member-menu.tsx
+++ b/web/app/components/header/account-setting/members-page/member-menu.tsx
@@ -2,14 +2,8 @@
import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'
import type { Role } from '@/models/access-control'
import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation } from '@tanstack/react-query'
import { memo, useMemo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -84,8 +78,8 @@ const MemberMenu = ({
return (
<div>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
size="lg"
@@ -96,32 +90,32 @@ const MemberMenu = ({
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-45 rounded-xl">
+ <MenuContent align="end" className="min-w-45 rounded-xl">
{canAssignRoles && (
- <DropdownMenuItem
+ <MenuItem
className="system-sm-medium text-text-secondary"
disabled={isSavingRoles}
onClick={handleOpenAssignRoles}
>
{assignRolesLabel}
- </DropdownMenuItem>
+ </MenuItem>
)}
{showTransferOwnership && (
- <DropdownMenuItem
+ <MenuItem
className="system-sm-medium text-text-secondary"
onClick={() => setTransferOpen(true)}
>
{t(($) => $['members.transferOwnership'], { ns: 'workspaceMembers' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- {(canAssignRoles || showTransferOwnership) && canRemove && <DropdownMenuSeparator />}
+ {(canAssignRoles || showTransferOwnership) && canRemove && <MenuSeparator />}
{canRemove && (
- <DropdownMenuItem variant="destructive" className="system-sm-medium" onClick={onRemove}>
+ <MenuItem variant="destructive" className="system-sm-medium" onClick={onRemove}>
{t(($) => $['members.removeFromTeam'], { ns: 'workspaceMembers' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
{roleSaveFailed && !assignModalOpen && (
<p role="alert" className="mt-1 system-xs-regular text-text-destructive">
{t(($) => $['api.actionFailed'], { ns: 'common' })}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx
index 47feba4daa0..f3e17b0bc92 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx
@@ -1,11 +1,6 @@
import type { ReactNode } from 'react'
import { Button } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import { TONE_LIST } from '@/config'
@@ -58,8 +53,8 @@ function PresetsParameter({ onSelect, supportedParameterNames }: PresetsParamete
if (!visiblePresetTones.length) return null
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<Button
size="small"
@@ -70,16 +65,16 @@ function PresetsParameter({ onSelect, supportedParameterNames }: PresetsParamete
>
{t(($) => $['modelProvider.loadPresets'], { ns: 'modelProvider' })}
<span className="i-ri-arrow-down-s-line size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent>
+ </MenuTrigger>
+ <MenuContent>
{visiblePresetTones.map((tone) => (
- <DropdownMenuItem key={tone.id} onClick={() => onSelect(tone.id)}>
+ <MenuItem key={tone.id} onClick={() => onSelect(tone.id)}>
{TONE_ICONS[tone.id]}
{t(($) => $[toneI18nKeyMap[tone.name]], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/provider-card-actions.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/provider-card-actions.tsx
index 001376704c5..d85d11cbe03 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/provider-card-actions.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/provider-card-actions.tsx
@@ -14,20 +14,20 @@ import {
import { Button } from '@langgenius/dify-ui/button'
import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { skipToken, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useId, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useLocale } from '#i18n'
import Badge from '@/app/components/base/badge'
-import { OperationDropdown } from '@/app/components/plugins/plugin-detail-panel/operation-dropdown'
+import { OperationMenu } from '@/app/components/plugins/plugin-detail-panel/operation-menu'
import PluginInfoContent from '@/app/components/plugins/plugin-page/plugin-info'
import { usePluginSettingsAccess } from '@/app/components/plugins/plugin-page/use-reference-setting'
import { PluginCategoryEnum, PluginSource } from '@/app/components/plugins/types'
@@ -228,10 +228,10 @@ function ProviderCardActions(props: Props) {
return (
<>
- <DropdownMenu open={!!version && versionMenuOpen} onOpenChange={setVersionMenuRequested}>
+ <Menu open={!!version && versionMenuOpen} onOpenChange={setVersionMenuRequested}>
{!!version &&
(canChangeVersion ? (
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<Button
variant="ghost"
@@ -252,18 +252,18 @@ function ProviderCardActions(props: Props) {
) : (
<Badge uppercase={false} text={version} hasRedCornerMark={hasNewVersion} />
))}
- <DropdownMenuContent
+ <MenuContent
className="max-h-[min(16rem,var(--available-height))]"
align="start"
aria-labelledby={versionMenuLabelId}
>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel id={versionMenuLabelId}>
+ <MenuGroup>
+ <MenuGroupLabel id={versionMenuLabelId}>
{t(($) => $['detailPanel.switchVersion'], { ns: 'plugin' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{version && versionsQuery.data && detail && autoUpgradeSettings.data ? (
versionsQuery.data.data.versions.map((item) => (
- <DropdownMenuItem
+ <MenuItem
key={item.unique_identifier}
disabled={version === item.version}
onClick={() => {
@@ -286,10 +286,10 @@ function ProviderCardActions(props: Props) {
<span className="ms-auto text-text-tertiary">
{formatDate(item.created_at, dateFormat)}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))
) : (
- <DropdownMenuItem
+ <MenuItem
closeOnClick={false}
onClick={() => {
if (versionsQuery.isError) void versionsQuery.refetch()
@@ -298,11 +298,11 @@ function ProviderCardActions(props: Props) {
}}
>
{t(($) => $['operation.retry'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
{source === PluginSource.debugging && (
<Badge
className="border-state-warning-active bg-state-warning-hover text-text-warning"
@@ -332,7 +332,7 @@ function ProviderCardActions(props: Props) {
</TooltipContent>
</Tooltip>
)}
- <OperationDropdown
+ <OperationMenu
source={source}
onInfo={handleInfo}
onCheckVersion={handleUpdate}
diff --git a/web/app/components/header/account-setting/permissions-page/role-list/row-menu.tsx b/web/app/components/header/account-setting/permissions-page/role-list/row-menu.tsx
index dde29457f78..bda5c371144 100644
--- a/web/app/components/header/account-setting/permissions-page/role-list/row-menu.tsx
+++ b/web/app/components/header/account-setting/permissions-page/role-list/row-menu.tsx
@@ -10,14 +10,8 @@ import {
AlertDialogHeader,
AlertDialogTitle,
} from '@langgenius/dify-ui/alert-dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useCallback, useState } from 'react'
@@ -105,8 +99,8 @@ const RowMenu = ({ roleCategory, role, onView, onEdit }: RowMenuProps) => {
return (
<>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
size="md"
@@ -117,46 +111,43 @@ const RowMenu = ({ roleCategory, role, onView, onEdit }: RowMenuProps) => {
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-40">
+ <MenuContent align="end" className="min-w-40">
{hasViewAction && (
- <DropdownMenuItem
- className="system-sm-semibold text-text-secondary"
- onClick={handleView}
- >
+ <MenuItem className="system-sm-semibold text-text-secondary" onClick={handleView}>
{t(($) => $['operation.view'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{hasEditAction && (
- <DropdownMenuItem
+ <MenuItem
disabled={!canManageRoles}
className="system-sm-semibold text-text-secondary"
onClick={handleEdit}
>
{t(($) => $['operation.edit'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- <DropdownMenuItem
+ <MenuItem
disabled={!canManageRoles}
className="system-sm-semibold text-text-secondary"
onClick={openCopyMembersConfirm}
>
{t(($) => $['common.duplicateAction'], { ns: 'permission' })}
- </DropdownMenuItem>
+ </MenuItem>
{hasDeleteAction && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ <MenuSeparator />
+ <MenuItem
disabled={!canManageRoles}
variant="destructive"
className="system-sm-semibold"
onClick={openDeleteConfirm}
>
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<AlertDialog
open={showDeleteConfirm}
onOpenChange={(open) => !open && setShowDeleteConfirm(false)}
diff --git a/web/app/components/integrations/sidebar-actions.tsx b/web/app/components/integrations/sidebar-actions.tsx
index ffc917223f1..f2afb0cc56f 100644
--- a/web/app/components/integrations/sidebar-actions.tsx
+++ b/web/app/components/integrations/sidebar-actions.tsx
@@ -14,7 +14,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/too
import { useRef } from 'react'
import { useTranslation } from 'react-i18next'
import DebugInfo from '@/app/components/plugins/plugin-page/debug-info'
-import InstallPluginDropdown from '@/app/components/plugins/plugin-page/install-plugin-dropdown'
+import InstallPluginMenu from '@/app/components/plugins/plugin-page/install-plugin-menu'
import PluginTasks from '@/app/components/plugins/plugin-page/plugin-tasks'
import { PermissionQuickPanel } from './permission-quick-panel'
import {
@@ -96,7 +96,7 @@ function IntegrationSidebarInstallActions({
content={permissionTooltip}
className="min-w-0 flex-1"
>
- <InstallPluginDropdown
+ <InstallPluginMenu
disabled={!canManagement}
rootClassName="w-full"
triggerVariant="primary"
diff --git a/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx b/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx
index 9fb003c6a4b..07dddd6eef2 100644
--- a/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx
+++ b/web/app/components/main-nav/components/__tests__/support-menu.spec.tsx
@@ -1,10 +1,6 @@
import type { CloudPlan } from '@dify/contracts/api/console/features/types.gen'
import type { Mock } from 'vite-plus/test'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuTrigger } from '@langgenius/dify-ui/menu'
import { screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { NuqsTestingAdapter } from 'nuqs/adapters/testing'
@@ -104,12 +100,12 @@ describe('SupportMenu', () => {
...(withPlan ? { features: { billing: { subscription: { plan } } } } : {}),
})
return render(
- <DropdownMenu open={true} onOpenChange={() => {}}>
- <DropdownMenuTrigger>open</DropdownMenuTrigger>
- <DropdownMenuContent>
+ <Menu open={true} onOpenChange={() => {}}>
+ <MenuTrigger>open</MenuTrigger>
+ <MenuContent>
<SupportMenu />
- </DropdownMenuContent>
- </DropdownMenu>,
+ </MenuContent>
+ </Menu>,
{ wrapper },
)
}
diff --git a/web/app/components/main-nav/components/account-section.tsx b/web/app/components/main-nav/components/account-section.tsx
index 56698b7a7f2..0b8f56cfcb7 100644
--- a/web/app/components/main-nav/components/account-section.tsx
+++ b/web/app/components/main-nav/components/account-section.tsx
@@ -3,7 +3,7 @@
import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'
import { cn } from '@langgenius/dify-ui/cn'
import { useSuspenseQuery } from '@tanstack/react-query'
-import AccountDropdown from '@/app/components/header/account-dropdown'
+import AccountMenu from '@/app/components/header/account-menu'
import { userProfileQueryOptions } from '@/features/account-profile/client'
import { getAvatarInitial } from '@/utils/avatar'
@@ -18,7 +18,7 @@ const AccountSection = ({ compact = false }: AccountSectionProps) => {
})
return (
- <AccountDropdown
+ <AccountMenu
trigger={({ ariaLabel }) => (
<button
type="button"
diff --git a/web/app/components/main-nav/components/help-menu.tsx b/web/app/components/main-nav/components/help-menu.tsx
index bfeaaf862d5..1aacb73a881 100644
--- a/web/app/components/main-nav/components/help-menu.tsx
+++ b/web/app/components/main-nav/components/help-menu.tsx
@@ -3,17 +3,17 @@
import type { IconButtonProps } from '@langgenius/dify-ui/icon-button'
import type { ReactElement, Ref } from 'react'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuCheckboxItem,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuCheckboxItem,
+ MenuContent,
+ MenuGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Switch } from '@langgenius/dify-ui/switch'
import { skipToken, useQuery, useSuspenseQuery } from '@tanstack/react-query'
import { useAtomValue, useSetAtom } from 'jotai'
@@ -23,11 +23,11 @@ import {
useLearnDifyHiddenValue,
useSetLearnDifyHidden,
} from '@/app/components/explore/learn-dify/storage'
-import Compliance from '@/app/components/header/account-dropdown/compliance'
+import Compliance from '@/app/components/header/account-menu/compliance'
import {
ExternalLinkIndicator,
MenuItemContent,
-} from '@/app/components/header/account-dropdown/menu-item-content'
+} from '@/app/components/header/account-menu/menu-item-content'
import GithubStar from '@/app/components/header/github-star'
import { useCreatorCenterUrl } from '@/app/components/plugins/marketplace/creator-center-url'
import { trackStepByStepTourEvent } from '@/app/components/step-by-step-tour/analytics'
@@ -154,8 +154,8 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
return (
<>
- <DropdownMenu onOpenChange={handleOpenChange}>
- <DropdownMenuTrigger
+ <Menu onOpenChange={handleOpenChange}>
+ <MenuTrigger
ref={triggerRef}
data-learn-dify-help-target
// oxlint-disable-next-line shadcn/no-restyle -- The recovery pulse animates box-shadow, so an outline replaces the ring.
@@ -180,42 +180,42 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
</IconButton>
}
/>
- <DropdownMenuContent
+ <MenuContent
side="top"
sideOffset={8}
className="w-60 overflow-hidden bg-components-panel-bg-blur! p-0! backdrop-blur-[5px]"
>
<>
- <DropdownMenuGroup className="p-1">
- <DropdownMenuLinkItem
+ <MenuGroup className="py-1">
+ <MenuLinkItem
href={docLink('/use-dify/getting-started/introduction')}
target="_blank"
rel="noopener noreferrer"
- className="mx-0 h-8 gap-1 px-3 py-1"
+ className="h-8 gap-1 px-3 py-1"
>
<MenuItemContent
iconClassName="i-ri-book-open-line"
label={t(($) => $['mainNav.help.docs'], { ns: 'navigation' })}
trailing={<ExternalLinkIndicator />}
/>
- </DropdownMenuLinkItem>
- <DropdownMenuLinkItem
+ </MenuLinkItem>
+ <MenuLinkItem
href="https://roadmap.dify.ai"
target="_blank"
rel="noopener noreferrer"
- className="mx-0 h-8 gap-1 px-3 py-1"
+ className="h-8 gap-1 px-3 py-1"
>
<MenuItemContent
iconClassName="i-ri-map-2-line"
label={t(($) => $['userProfile.roadmap'], { ns: 'common' })}
trailing={<ExternalLinkIndicator />}
/>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
{shouldShowLearnDifySwitch && (
- <DropdownMenuCheckboxItem
+ <MenuCheckboxItem
checked={!learnDifyHidden}
closeOnClick={false}
- className="mx-0 h-8 gap-1 py-1 ps-3 pe-2"
+ className="h-8 gap-1 py-1 ps-3 pe-2"
onCheckedChange={(checked) => setLearnDifyHidden(!checked)}
>
<span
@@ -226,13 +226,13 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
{t(($) => $['mainNav.help.learnDify'], { ns: 'navigation' })}
</span>
<MenuSwitchIndicator checked={!learnDifyHidden} />
- </DropdownMenuCheckboxItem>
+ </MenuCheckboxItem>
)}
{systemFeatures.deployment_edition === 'CLOUD' && shouldShowStepByStepTourSwitch && (
- <DropdownMenuCheckboxItem
+ <MenuCheckboxItem
checked={stepByStepTourEnabled}
closeOnClick={!stepByStepTourEnabled}
- className="mx-0 h-8 gap-1 py-1 ps-3 pe-2"
+ className="h-8 gap-1 py-1 ps-3 pe-2"
disabled={!canToggleStepByStepTour}
onCheckedChange={handleStepByStepTourCheckedChange}
>
@@ -244,35 +244,35 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
{t(($) => $['mainNav.help.stepByStepTour'], { ns: 'navigation' })}
</span>
<MenuSwitchIndicator checked={stepByStepTourEnabled} />
- </DropdownMenuCheckboxItem>
+ </MenuCheckboxItem>
)}
{systemFeatures.deployment_edition === 'CLOUD' && isCurrentWorkspaceOwner && (
<Compliance />
)}
- </DropdownMenuGroup>
- <DropdownMenuSeparator className="my-0!" />
- <DropdownMenuGroup className="p-1">
+ </MenuGroup>
+ <MenuSeparator className="my-0!" />
+ <MenuGroup className="py-1">
<SupportMenu />
- </DropdownMenuGroup>
- <DropdownMenuSeparator className="my-0!" />
- <DropdownMenuGroup className="p-1">
- <DropdownMenuLinkItem
+ </MenuGroup>
+ <MenuSeparator className="my-0!" />
+ <MenuGroup className="py-1">
+ <MenuLinkItem
href={creatorCenterUrl}
target="_blank"
rel="noopener noreferrer"
- className="mx-0 h-8 gap-1 px-3 py-1.5"
+ className="h-8 gap-1 px-3 py-1.5"
>
<MenuItemContent
iconClassName="i-ri-user-star-line"
label={t(($) => $['mainNav.help.creatorCenter'], { ns: 'navigation' })}
trailing={<ExternalLinkIndicator />}
/>
- </DropdownMenuLinkItem>
- <DropdownMenuLinkItem
+ </MenuLinkItem>
+ <MenuLinkItem
href="https://github.com/langgenius/dify"
target="_blank"
rel="noopener noreferrer"
- className="mx-0 h-8 gap-1 px-3 py-1.5"
+ className="h-8 gap-1 px-3 py-1.5"
>
<MenuItemContent
iconClassName="i-ri-github-line"
@@ -287,12 +287,9 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
</div>
}
/>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
{env.NEXT_PUBLIC_SITE_ABOUT !== 'hide' && (
- <DropdownMenuItem
- className="mx-0 h-8 gap-1 px-3 py-1.5"
- onClick={() => setAboutOpen(true)}
- >
+ <MenuItem className="h-8 gap-1 px-3 py-1.5" onClick={() => setAboutOpen(true)}>
<MenuItemContent
iconClassName="i-ri-information-2-line"
label={t(($) => $['userProfile.about'], { ns: 'common' })}
@@ -307,12 +304,12 @@ const HelpMenu = ({ triggerIcon, triggerClassName, triggerRef, triggerSize }: He
</div>
}
/>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuGroup>
+ </MenuGroup>
</>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<AccountAboutDialog
open={aboutOpen}
onOpenChange={setAboutOpen}
diff --git a/web/app/components/main-nav/components/support-menu.tsx b/web/app/components/main-nav/components/support-menu.tsx
index 4f786912efb..49dce523f36 100644
--- a/web/app/components/main-nav/components/support-menu.tsx
+++ b/web/app/components/main-nav/components/support-menu.tsx
@@ -1,4 +1,4 @@
-import { DropdownMenuItem, DropdownMenuLinkItem } from '@langgenius/dify-ui/dropdown-menu'
+import { MenuItem, MenuLinkItem } from '@langgenius/dify-ui/menu'
import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
import { useQueryState } from 'nuqs'
import { useTranslation } from 'react-i18next'
@@ -10,7 +10,7 @@ import {
import {
ExternalLinkIndicator,
MenuItemContent,
-} from '@/app/components/header/account-dropdown/menu-item-content'
+} from '@/app/components/header/account-menu/menu-item-content'
import { generateMailToLink, mailToSupport } from '@/app/components/header/utils/util'
import { toast } from '@/app/notifications'
import { SUPPORT_EMAIL_ADDRESS, ZENDESK_WIDGET_KEY } from '@/config'
@@ -59,8 +59,8 @@ export default function SupportMenu() {
return (
<>
{shouldShowUpgradeContact && (
- <DropdownMenuItem
- className="mx-0 h-8 gap-1 px-3 py-1"
+ <MenuItem
+ className="h-8 gap-1 px-3 py-1"
onClick={() => {
setPricing('open')
}}
@@ -78,11 +78,11 @@ export default function SupportMenu() {
</span>
}
/>
- </DropdownMenuItem>
+ </MenuItem>
)}
{!shouldShowUpgradeContact && hasDedicatedChannel && hasZendeskWidget && (
- <DropdownMenuItem
- className="mx-0 h-8 gap-1 px-3 py-1"
+ <MenuItem
+ className="h-8 gap-1 px-3 py-1"
onClick={() => {
void zendeskRuntime.open(deploymentEdition).catch(() => {
toast.error(t(($) => $['api.actionFailed'], { ns: 'common' }))
@@ -93,11 +93,11 @@ export default function SupportMenu() {
iconClassName="i-ri-chat-smile-2-line"
label={t(($) => $['userProfile.contactUs'], { ns: 'common' })}
/>
- </DropdownMenuItem>
+ </MenuItem>
)}
{!shouldShowUpgradeContact && hasDedicatedChannel && !hasZendeskWidget && supportMailLink && (
- <DropdownMenuLinkItem
- className="mx-0 h-8 gap-1 px-3 py-1"
+ <MenuLinkItem
+ className="h-8 gap-1 px-3 py-1"
href={supportMailLink}
rel="noopener noreferrer"
target="_blank"
@@ -107,10 +107,10 @@ export default function SupportMenu() {
label={t(($) => $['userProfile.emailSupport'], { ns: 'common' })}
trailing={<ExternalLinkIndicator />}
/>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)}
- <DropdownMenuLinkItem
- className="mx-0 h-8 gap-1 px-3 py-1"
+ <MenuLinkItem
+ className="h-8 gap-1 px-3 py-1"
href="https://discord.gg/5AEfbxcd9k"
rel="noopener noreferrer"
target="_blank"
@@ -120,7 +120,7 @@ export default function SupportMenu() {
label={t(($) => $['userProfile.discord'], { ns: 'common' })}
trailing={<ExternalLinkIndicator />}
/>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
</>
)
}
diff --git a/web/app/components/main-nav/components/workspace-switcher.tsx b/web/app/components/main-nav/components/workspace-switcher.tsx
index f1cc0ba3a01..e8041c4bccb 100644
--- a/web/app/components/main-nav/components/workspace-switcher.tsx
+++ b/web/app/components/main-nav/components/workspace-switcher.tsx
@@ -3,15 +3,15 @@
import type { TenantListItemResponse } from '@dify/contracts/api/console/workspaces/types.gen'
import { cn } from '@langgenius/dify-ui/cn'
import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from '@langgenius/dify-ui/collapsible'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useId, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { SearchInput } from '@/app/components/base/search-input'
@@ -73,8 +73,8 @@ function WorkspaceSwitchControls({
{t(($) => $['userProfile.workspace'], { ns: 'common' })}
</span>
</div>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
disabled={disabled}
className="data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
render={
@@ -85,25 +85,28 @@ function WorkspaceSwitchControls({
</IconButton>
}
/>
- <DropdownMenuContent className="w-40 bg-components-panel-bg-blur! p-1! backdrop-blur-[5px]">
- <DropdownMenuRadioGroup<WorkspaceSort> value={sort} onValueChange={onSortChange}>
+ <MenuContent
+ align="end"
+ className="w-40 bg-components-panel-bg-blur! backdrop-blur-[5px]"
+ >
+ <MenuRadioGroup<WorkspaceSort> value={sort} onValueChange={onSortChange}>
{sortOptions.map((option) => (
- <DropdownMenuRadioItem<WorkspaceSort>
+ <MenuRadioItem<WorkspaceSort>
key={option.value}
value={option.value}
- className="mx-0 h-8 gap-1 px-2 py-1"
+ className="h-8 gap-1 px-2 py-1"
>
<span className="flex size-4 shrink-0 items-center justify-center">
- <DropdownMenuRadioItemIndicator className="ms-0" />
+ <MenuRadioItemIndicator className="ms-0" />
</span>
<span className="min-w-0 flex-1 truncate px-1 system-md-regular text-text-secondary">
{option.label}
</span>
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
<CollapsibleTrigger
disabled={disabled}
className="text-text-secondary data-panel-open:bg-state-base-hover"
diff --git a/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx b/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx
index 697ead61cb4..bdbde5c6178 100644
--- a/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx
+++ b/web/app/components/plugins/marketplace/creator-profile/creator-content.tsx
@@ -10,13 +10,13 @@ import type {
} from './model'
import type { Plugin } from '@/app/components/plugins/types'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { parseAsStringEnum, useQueryStates } from 'nuqs'
import { useMemo, useState } from 'react'
import { useTranslation } from '#i18n'
@@ -161,8 +161,8 @@ export default function CreatorContent({
</h2>
<div className="flex h-8 items-center">
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
aria-label={`${t(($) => $['marketplace.creatorProfile.sortBy'], { ns: 'plugin' })} ${selectedSort.label}`}
className="flex h-8 items-center rounded-lg px-2 hover:bg-state-base-hover"
>
@@ -171,28 +171,28 @@ export default function CreatorContent({
</span>
<span className="system-sm-medium text-text-secondary">{selectedSort.label}</span>
<span aria-hidden className="ml-1 i-ri-arrow-down-s-line size-4 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="min-w-[176px] p-1">
- <DropdownMenuRadioGroup<CreatorSortField>
+ </MenuTrigger>
+ <MenuContent className="min-w-[176px]">
+ <MenuRadioGroup<CreatorSortField>
value={sortField}
onValueChange={(nextField) => {
void setSort({ sort_by: nextField, sort_order: sortOrder })
}}
>
{sortOptions.map((option) => (
- <DropdownMenuRadioItem<CreatorSortField>
+ <MenuRadioItem<CreatorSortField>
key={option.value}
value={option.value}
closeOnClick
className="justify-between px-3 pr-2 system-md-regular text-text-primary"
>
{option.label}
- <DropdownMenuRadioItemIndicator className="ml-2" />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator className="ml-2" />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
<div className="mx-1 h-4 w-px bg-divider-regular" />
<button
diff --git a/web/app/components/plugins/marketplace/description/index.tsx b/web/app/components/plugins/marketplace/description/index.tsx
index 7aa6c9d2fc1..06b81f604a2 100644
--- a/web/app/components/plugins/marketplace/description/index.tsx
+++ b/web/app/components/plugins/marketplace/description/index.tsx
@@ -6,7 +6,7 @@ import { motion, useMotionValue, useSpring, useTransform } from 'motion/react'
import { useEffect, useLayoutEffect, useRef } from 'react'
import { useLocale, useTranslation } from '#i18n'
import { DifyLogo } from '@/app/components/base/logo/dify-logo'
-import { SubmitRequestDropdown } from '@/app/components/plugins/plugin-page/nav-operations'
+import { SubmitRequestMenu } from '@/app/components/plugins/plugin-page/nav-operations'
import { MARKETPLACE_CONTAINER_ID } from '../constants'
import PluginTypeSwitch from '../plugin-type-switch'
import { MarketplaceSearchInput } from '../search-input'
@@ -241,7 +241,7 @@ const Description = ({
<MarketplaceSearchInput className="w-64 shrink-0" />
<div className="flex h-full shrink-0 items-center justify-end gap-4 pr-3.5 pl-4">
<Separator decorative orientation="vertical" className="mx-0 h-4" />
- <SubmitRequestDropdown dividerAfterFirst />
+ <SubmitRequestMenu dividerAfterFirst />
</div>
</div>
</div>
diff --git a/web/app/components/plugins/marketplace/home/home-guide.tsx b/web/app/components/plugins/marketplace/home/home-guide.tsx
index c3225f72816..52633c66d90 100644
--- a/web/app/components/plugins/marketplace/home/home-guide.tsx
+++ b/web/app/components/plugins/marketplace/home/home-guide.tsx
@@ -3,8 +3,8 @@
import type { DocPathWithoutLang } from '@/types/doc-paths'
import { useLocale } from '#i18n'
import {
- SubmitRequestDropdown,
- SubmitRequestDropdownMenu,
+ SubmitRequestMenu,
+ SubmitRequestMenuView,
} from '@/app/components/plugins/plugin-page/nav-operations'
import { defaultDocBaseUrl } from '@/context/i18n'
import { getDocLanguage } from '@/i18n/language'
@@ -14,12 +14,12 @@ function MarketplaceGuide() {
const docLanguage = getDocLanguage(locale)
const docLink = (path: DocPathWithoutLang) => `${defaultDocBaseUrl}/${docLanguage}${path}`
- return <SubmitRequestDropdownMenu dividerAfterFirst docLink={docLink} />
+ return <SubmitRequestMenuView dividerAfterFirst docLink={docLink} />
}
export default function HomeGuide({ isMarketplacePlatform }: { isMarketplacePlatform: boolean }) {
// Standalone Marketplace cannot call useDocLink(): it reads the console-only
- // systemFeatures suspense query and crashes SSR. The dropdown paths have no
+ // systemFeatures suspense query and crashes SSR. The menu paths have no
// product-specific variants, so composing the URL from the locale matches.
- return isMarketplacePlatform ? <MarketplaceGuide /> : <SubmitRequestDropdown dividerAfterFirst />
+ return isMarketplacePlatform ? <MarketplaceGuide /> : <SubmitRequestMenu dividerAfterFirst />
}
diff --git a/web/app/components/plugins/marketplace/list/__tests__/list-wrapper-scroll.browser.spec.tsx b/web/app/components/plugins/marketplace/list/__tests__/list-wrapper-scroll.browser.spec.tsx
index 87ae3241de1..bac4b5dce37 100644
--- a/web/app/components/plugins/marketplace/list/__tests__/list-wrapper-scroll.browser.spec.tsx
+++ b/web/app/components/plugins/marketplace/list/__tests__/list-wrapper-scroll.browser.spec.tsx
@@ -25,7 +25,7 @@ vi.mock('#i18n', () => ({
}),
}))
-vi.mock('../../sort-dropdown', () => ({
+vi.mock('../../sort-menu', () => ({
default: () => <div>sort</div>,
}))
diff --git a/web/app/components/plugins/marketplace/list/__tests__/list-wrapper.spec.tsx b/web/app/components/plugins/marketplace/list/__tests__/list-wrapper.spec.tsx
index 175cbcfb916..389e80ba765 100644
--- a/web/app/components/plugins/marketplace/list/__tests__/list-wrapper.spec.tsx
+++ b/web/app/components/plugins/marketplace/list/__tests__/list-wrapper.spec.tsx
@@ -32,8 +32,8 @@ vi.mock('#i18n', async () => {
}
})
-vi.mock('../../sort-dropdown', () => ({
- default: () => <div data-testid="sort-dropdown">sort</div>,
+vi.mock('../../sort-menu', () => ({
+ default: () => <div data-testid="sort-menu">sort</div>,
}))
vi.mock('../index', () => ({
@@ -74,7 +74,7 @@ describe('ListWrapper', () => {
renderListWrapper(<ListWrapper />)
expect(screen.getByRole('status')).toHaveTextContent('1 plugins found')
- expect(screen.getByTestId('sort-dropdown')).toBeInTheDocument()
+ expect(screen.getByTestId('sort-menu')).toBeInTheDocument()
})
it('keeps the status owner mounted through pagination and reports the total result count', () => {
diff --git a/web/app/components/plugins/marketplace/list/list-wrapper.tsx b/web/app/components/plugins/marketplace/list/list-wrapper.tsx
index 266873a7292..177e1111d45 100644
--- a/web/app/components/plugins/marketplace/list/list-wrapper.tsx
+++ b/web/app/components/plugins/marketplace/list/list-wrapper.tsx
@@ -11,7 +11,7 @@ import {
markMarketplaceSiteSearch,
} from '@/utils/marketplace-site-track'
import { useSearchPluginText } from '../atoms'
-import SortDropdown from '../sort-dropdown'
+import SortMenu from '../sort-menu'
import { useMarketplaceData } from '../state'
import List from './index'
@@ -105,7 +105,7 @@ const ListWrapper = ({
})}
</div>
<div className="mx-3 h-3.5 w-px bg-divider-regular"></div>
- <SortDropdown />
+ <SortMenu />
</div>
)}
{isError && !plugins?.length ? (
diff --git a/web/app/components/plugins/marketplace/sort-dropdown/__tests__/index.spec.tsx b/web/app/components/plugins/marketplace/sort-menu/__tests__/index.spec.tsx
similarity index 95%
rename from web/app/components/plugins/marketplace/sort-dropdown/__tests__/index.spec.tsx
rename to web/app/components/plugins/marketplace/sort-menu/__tests__/index.spec.tsx
index de10f51fd20..adef922325f 100644
--- a/web/app/components/plugins/marketplace/sort-dropdown/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/marketplace/sort-menu/__tests__/index.spec.tsx
@@ -1,6 +1,6 @@
import { render, screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import SortDropdown from '../index'
+import SortMenu from '../index'
const mockTranslation = vi.hoisted(() =>
vi.fn((key: string, options?: { ns?: string }) => {
@@ -32,7 +32,7 @@ vi.mock('../../atoms', () => ({
useMarketplaceSort: () => [mockSort, mockHandleSortChange],
}))
-describe('SortDropdown', () => {
+describe('SortMenu', () => {
beforeEach(() => {
vi.clearAllMocks()
mockSort = { sortBy: 'install_count', sortOrder: 'DESC' }
@@ -41,14 +41,14 @@ describe('SortDropdown', () => {
it('falls back to the default option when the current sort is invalid', () => {
mockSort = { sortBy: 'unknown', sortOrder: 'ASC' }
- render(<SortDropdown />)
+ render(<SortMenu />)
expect(screen.getByText('Most Popular')).toBeInTheDocument()
})
it('updates the sort and closes the menu when an option is selected', async () => {
const user = userEvent.setup()
- render(<SortDropdown />)
+ render(<SortMenu />)
await user.click(screen.getByRole('button', { name: 'Sort by Most Popular' }))
const menu = within(await screen.findByRole('menu'))
diff --git a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx b/web/app/components/plugins/marketplace/sort-menu/index.tsx
similarity index 72%
rename from web/app/components/plugins/marketplace/sort-dropdown/index.tsx
rename to web/app/components/plugins/marketplace/sort-menu/index.tsx
index 2512b363331..8647d36e990 100644
--- a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
+++ b/web/app/components/plugins/marketplace/sort-menu/index.tsx
@@ -1,16 +1,16 @@
'use client'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from '#i18n'
import { useMarketplaceSort } from '../atoms'
-const SortDropdown = () => {
+const SortMenu = () => {
const { t } = useTranslation(['plugin'])
const options = [
{
@@ -40,16 +40,16 @@ const SortDropdown = () => {
options[0]!
return (
- <DropdownMenu>
- <DropdownMenuTrigger className="flex h-8 cursor-pointer items-center gap-1 rounded-lg bg-state-base-hover-alt px-2 pr-3">
+ <Menu>
+ <MenuTrigger className="flex h-8 cursor-pointer items-center gap-1 rounded-lg bg-state-base-hover-alt px-2 pr-3">
<span className="system-sm-regular text-text-secondary">
{t(($) => $['marketplace.sortBy'], { ns: 'plugin' })}
</span>
<span className="system-sm-medium text-text-primary">{selectedOption.text}</span>
<span aria-hidden className="i-ri-arrow-down-s-line size-4 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="px-1">
- <DropdownMenuRadioGroup
+ </MenuTrigger>
+ <MenuContent align="start">
+ <MenuRadioGroup
value={`${selectedOption.value}-${selectedOption.order}`}
onValueChange={(nextValue) => {
const option = options.find((option) => `${option.value}-${option.order}` === nextValue)
@@ -57,20 +57,20 @@ const SortDropdown = () => {
}}
>
{options.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={`${option.value}-${option.order}`}
value={`${option.value}-${option.order}`}
closeOnClick
className="justify-between pl-3 system-md-regular text-text-primary"
>
{option.text}
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
-export default SortDropdown
+export default SortMenu
diff --git a/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx b/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx
index a439ebf3cd0..c646e3603f7 100644
--- a/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/permission-selector.tsx
@@ -2,13 +2,13 @@ import type { CredentialPermission } from '@/models/permission'
import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next'
import { userProfileQueryOptions } from '@/features/account-profile/client'
@@ -37,8 +37,8 @@ const PermissionSelector = ({ disabled, permission, onChange }: PermissionSelect
const selectedPermissionLabel = isOnlyMe ? onlyMeLabel : allTeamMembersLabel
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
aria-label={`${permissionLabel}: ${selectedPermissionLabel}`}
disabled={disabled}
className={cn(
@@ -73,14 +73,14 @@ const PermissionSelector = ({ disabled, permission, onChange }: PermissionSelect
aria-hidden="true"
className="i-ri-arrow-down-s-line size-4 shrink-0 text-text-quaternary group-data-disabled/permission-trigger:text-components-input-text-placeholder! group-data-popup-open/permission-trigger:text-text-secondary"
/>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-(--anchor-width) max-w-(--available-width)">
- <DropdownMenuRadioGroup<CredentialPermission>
+ </MenuTrigger>
+ <MenuContent align="start" className="w-(--anchor-width) max-w-(--available-width)">
+ <MenuRadioGroup<CredentialPermission>
value={permission}
onValueChange={onChange}
aria-label={permissionLabel}
>
- <DropdownMenuRadioItem<CredentialPermission>
+ <MenuRadioItem<CredentialPermission>
aria-label={onlyMeLabel}
value={PermissionLevel.onlyMe}
closeOnClick
@@ -93,9 +93,9 @@ const PermissionSelector = ({ disabled, permission, onChange }: PermissionSelect
<div className="min-w-0 grow px-1 system-md-regular text-text-secondary">
{onlyMeLabel}
</div>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- <DropdownMenuRadioItem<CredentialPermission>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ <MenuRadioItem<CredentialPermission>
value={PermissionLevel.allTeamMembers}
closeOnClick
className="touch-manipulation"
@@ -106,11 +106,11 @@ const PermissionSelector = ({ disabled, permission, onChange }: PermissionSelect
<div className="min-w-0 grow px-1 system-md-regular text-text-secondary">
{allTeamMembersLabel}
</div>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/plugins/plugin-detail-panel/__tests__/operation-dropdown.spec.tsx b/web/app/components/plugins/plugin-detail-panel/__tests__/operation-menu.spec.tsx
similarity index 76%
rename from web/app/components/plugins/plugin-detail-panel/__tests__/operation-dropdown.spec.tsx
rename to web/app/components/plugins/plugin-detail-panel/__tests__/operation-menu.spec.tsx
index b1c6ee42e56..777f06cb923 100644
--- a/web/app/components/plugins/plugin-detail-panel/__tests__/operation-dropdown.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/__tests__/operation-menu.spec.tsx
@@ -4,16 +4,16 @@ import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
import { renderWithConsoleQuery } from '@/test/console/query-data'
import { PluginSource } from '../../types'
-import { OperationDropdown } from '../operation-dropdown'
+import { OperationMenu } from '../operation-menu'
const render = (ui: ReactElement, enableMarketplace = true) =>
renderWithConsoleQuery(ui, { systemFeatures: { enable_marketplace: enableMarketplace } })
-const openDropdown = async (user: ReturnType<typeof userEvent.setup>) => {
+const openMenu = async (user: ReturnType<typeof userEvent.setup>) => {
await user.click(screen.getByRole('button', { name: 'plugin.detailPanel.operation.moreActions' }))
}
-describe('OperationDropdown', () => {
+describe('OperationMenu', () => {
const mockOnInfo = vi.fn()
const mockOnCheckVersion = vi.fn()
const mockOnRemove = vi.fn()
@@ -33,9 +33,9 @@ describe('OperationDropdown', () => {
describe('Rendering', () => {
it('should render marketplace detail action for marketplace source', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.marketplace} />)
+ render(<OperationMenu {...defaultProps} source={PluginSource.marketplace} />)
- await openDropdown(user)
+ await openMenu(user)
expect(screen.queryByText('plugin.detailPanel.operation.info')).not.toBeInTheDocument()
expect(screen.queryByText('plugin.detailPanel.operation.checkUpdate')).not.toBeInTheDocument()
@@ -45,22 +45,22 @@ describe('OperationDropdown', () => {
it('should render README action only when provided', async () => {
const user = userEvent.setup()
- const { unmount } = render(<OperationDropdown {...defaultProps} />)
+ const { unmount } = render(<OperationMenu {...defaultProps} />)
- await openDropdown(user)
+ await openMenu(user)
expect(screen.queryByText('plugin.detailPanel.operation.viewReadme')).not.toBeInTheDocument()
unmount()
- render(<OperationDropdown {...defaultProps} onViewReadme={mockOnViewReadme} />)
- await openDropdown(user)
+ render(<OperationMenu {...defaultProps} onViewReadme={mockOnViewReadme} />)
+ await openMenu(user)
expect(screen.getByText('plugin.detailPanel.operation.viewReadme')).toBeInTheDocument()
})
it('should not render marketplace detail when source cannot open a detail page', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.local} />)
+ render(<OperationMenu {...defaultProps} source={PluginSource.local} />)
- await openDropdown(user)
+ await openMenu(user)
expect(screen.queryByText('plugin.detailPanel.operation.viewDetail')).not.toBeInTheDocument()
expect(screen.getByText('plugin.detailPanel.operation.remove')).toBeInTheDocument()
@@ -68,7 +68,7 @@ describe('OperationDropdown', () => {
it('should not render the trigger when every action is unavailable', () => {
render(
- <OperationDropdown
+ <OperationMenu
{...defaultProps}
source={PluginSource.local}
showRemove={false}
@@ -85,9 +85,9 @@ describe('OperationDropdown', () => {
describe('User Interactions', () => {
it('should call onInfo when the info action is clicked', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.github} />)
+ render(<OperationMenu {...defaultProps} source={PluginSource.github} />)
- await openDropdown(user)
+ await openMenu(user)
await user.click(screen.getByText('plugin.detailPanel.operation.info'))
expect(mockOnInfo).toHaveBeenCalledTimes(1)
@@ -95,9 +95,9 @@ describe('OperationDropdown', () => {
it('should call onCheckVersion when the check update action is clicked', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.github} />)
+ render(<OperationMenu {...defaultProps} source={PluginSource.github} />)
- await openDropdown(user)
+ await openMenu(user)
await user.click(screen.getByText('plugin.detailPanel.operation.checkUpdate'))
expect(mockOnCheckVersion).toHaveBeenCalledTimes(1)
@@ -105,9 +105,9 @@ describe('OperationDropdown', () => {
it('should call onRemove when the remove action is clicked', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.github} />)
+ render(<OperationMenu {...defaultProps} source={PluginSource.github} />)
- await openDropdown(user)
+ await openMenu(user)
await user.click(screen.getByText('plugin.detailPanel.operation.remove'))
expect(mockOnRemove).toHaveBeenCalledTimes(1)
@@ -115,9 +115,9 @@ describe('OperationDropdown', () => {
it('should call onViewReadme when README action is clicked', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} onViewReadme={mockOnViewReadme} />)
+ render(<OperationMenu {...defaultProps} onViewReadme={mockOnViewReadme} />)
- await openDropdown(user)
+ await openMenu(user)
await user.click(screen.getByText('plugin.detailPanel.operation.viewReadme'))
expect(mockOnViewReadme).toHaveBeenCalledTimes(1)
@@ -125,9 +125,9 @@ describe('OperationDropdown', () => {
it('should render view detail as an external link', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.github} />)
+ render(<OperationMenu {...defaultProps} source={PluginSource.github} />)
- await openDropdown(user)
+ await openMenu(user)
const link = screen.getByText('plugin.detailPanel.operation.viewDetail').closest('a')
expect(link).toHaveAttribute('href', 'https://github.com/test/repo')
@@ -139,9 +139,9 @@ describe('OperationDropdown', () => {
describe('Feature Flags', () => {
it('should hide marketplace detail when marketplace is disabled', async () => {
const user = userEvent.setup()
- render(<OperationDropdown {...defaultProps} source={PluginSource.github} />, false)
+ render(<OperationMenu {...defaultProps} source={PluginSource.github} />, false)
- await openDropdown(user)
+ await openMenu(user)
expect(screen.queryByText('plugin.detailPanel.operation.viewDetail')).not.toBeInTheDocument()
expect(screen.getByText('plugin.detailPanel.operation.info')).toBeInTheDocument()
diff --git a/web/app/components/plugins/plugin-detail-panel/detail-header/index.tsx b/web/app/components/plugins/plugin-detail-panel/detail-header/index.tsx
index a62a681ec01..1df22a60cb1 100644
--- a/web/app/components/plugins/plugin-detail-panel/detail-header/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/detail-header/index.tsx
@@ -4,15 +4,15 @@ import type { PluginVersionsResponse } from '@dify/contracts/marketplace'
import type { PluginDetail } from '../../types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { skipToken, useQuery } from '@tanstack/react-query'
import { useCallback, useId, useMemo } from 'react'
@@ -20,7 +20,7 @@ import { useTranslation } from 'react-i18next'
import { useLocale } from '#i18n'
import Badge from '@/app/components/base/badge'
import { AuthCategory, PluginAuth } from '@/app/components/plugins/plugin-auth'
-import { OperationDropdown } from '@/app/components/plugins/plugin-detail-panel/operation-dropdown'
+import { OperationMenu } from '@/app/components/plugins/plugin-detail-panel/operation-menu'
import { BUILTIN_TOOLS_ARRAY } from '@/app/components/plugins/readme-panel/constants'
import { useReadmePanelStore } from '@/app/components/plugins/readme-panel/store'
import { selectToolCollections } from '@/app/components/tools/utils/query-select'
@@ -237,7 +237,7 @@ const DetailHeader = ({
)}
{/* Version Picker */}
- <DropdownMenu
+ <Menu
open={
!!version &&
versionPicker.isShow &&
@@ -249,7 +249,7 @@ const DetailHeader = ({
onOpenChange={versionPicker.setIsShow}
>
{!!version && (
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<Button
variant="ghost"
@@ -272,18 +272,18 @@ const DetailHeader = ({
}
/>
)}
- <DropdownMenuContent
+ <MenuContent
className="max-h-[min(16rem,var(--available-height))]"
align="start"
aria-labelledby={versionMenuLabelId}
>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel id={versionMenuLabelId}>
+ <MenuGroup>
+ <MenuGroupLabel id={versionMenuLabelId}>
{t(($) => $['detailPanel.switchVersion'], { ns: 'plugin' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{versionsQuery.data && autoUpgradeSettings.data ? (
versionsQuery.data.data.versions.map((item) => (
- <DropdownMenuItem
+ <MenuItem
key={item.unique_identifier}
disabled={version === item.version}
onClick={() => handleVersionSelect(item)}
@@ -295,10 +295,10 @@ const DetailHeader = ({
<span className="ms-auto text-text-tertiary">
{formatDate(item.created_at, dateFormat)}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))
) : (
- <DropdownMenuItem
+ <MenuItem
closeOnClick={false}
onClick={() => {
if (versionsQuery.isError) void versionsQuery.refetch()
@@ -306,11 +306,11 @@ const DetailHeader = ({
}}
>
{t(($) => $['operation.retry'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
{/* Auto Update Badge */}
{isAutoUpgradeEnabled && !isReadmeView && (
@@ -380,7 +380,7 @@ const DetailHeader = ({
{/* Action Buttons */}
{!isReadmeView && (
<div className="flex gap-1">
- <OperationDropdown
+ <OperationMenu
source={source}
onInfo={modalStates.showPluginInfo}
onCheckVersion={handleUpdate}
diff --git a/web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx b/web/app/components/plugins/plugin-detail-panel/operation-menu.tsx
similarity index 78%
rename from web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx
rename to web/app/components/plugins/plugin-detail-panel/operation-menu.tsx
index f96834970a5..860d063af77 100644
--- a/web/app/components/plugins/plugin-detail-panel/operation-dropdown.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/operation-menu.tsx
@@ -1,22 +1,22 @@
'use client'
-import type { DropdownMenuContentProps } from '@langgenius/dify-ui/dropdown-menu'
+import type { MenuContentProps } from '@langgenius/dify-ui/menu'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuItem,
+ MenuLinkItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useSuspenseQuery } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next'
import { systemFeaturesQueryOptions } from '@/features/system-features/client'
import { PluginSource } from '../types'
-type OperationDropdownProps = Readonly<
- Pick<DropdownMenuContentProps, 'side' | 'align'> & {
+type OperationMenuProps = Readonly<
+ Pick<MenuContentProps, 'side' | 'align'> & {
source: PluginSource
onInfo: () => void
onCheckVersion: () => void
@@ -32,7 +32,7 @@ type OperationDropdownProps = Readonly<
}
>
-export function OperationDropdown({
+export function OperationMenu({
source,
detailUrl,
onInfo,
@@ -47,7 +47,7 @@ export function OperationDropdown({
destructiveRemove = false,
showCheckVersion = true,
showRemove = true,
-}: OperationDropdownProps) {
+}: OperationMenuProps) {
const { t } = useTranslation(['plugin'])
const { data: enable_marketplace } = useSuspenseQuery({
...systemFeaturesQueryOptions(),
@@ -70,8 +70,8 @@ export function OperationDropdown({
return null
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={
@@ -84,29 +84,26 @@ export function OperationDropdown({
</IconButton>
}
/>
- <DropdownMenuContent side={side} align={align} className={cn('w-48 py-1', popupClassName)}>
+ <MenuContent side={side} align={align} className={cn('w-48 py-1', popupClassName)}>
{showInfo && (
- <DropdownMenuItem
- className="px-2 py-1 system-md-regular text-text-secondary"
- onClick={onInfo}
- >
+ <MenuItem className="px-2 py-1 system-md-regular text-text-secondary" onClick={onInfo}>
<span className="min-w-0 grow truncate px-1 py-0.5">
{t(($) => $['detailPanel.operation.info'], { ns: 'plugin' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{showCheckVersionAction && (
- <DropdownMenuItem
+ <MenuItem
className="px-2 py-1 system-md-regular text-text-secondary"
onClick={onCheckVersion}
>
<span className="min-w-0 grow truncate px-1 py-0.5">
{t(($) => $['detailPanel.operation.checkUpdate'], { ns: 'plugin' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{showMarketplaceDetail && (
- <DropdownMenuLinkItem
+ <MenuLinkItem
className="px-2 py-1 system-md-regular text-text-secondary"
href={detailUrl}
target="_blank"
@@ -116,21 +113,21 @@ export function OperationDropdown({
{t(($) => $['detailPanel.operation.viewDetail'], { ns: 'plugin' })}
</span>
<span className="i-ri-arrow-right-up-line size-3.5 shrink-0 text-text-tertiary" />
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)}
{onViewReadme && (
- <DropdownMenuItem
+ <MenuItem
className="px-2 py-1 system-md-regular text-text-secondary"
onClick={onViewReadme}
>
<span className="min-w-0 grow truncate px-1 py-0.5">
{t(($) => $['detailPanel.operation.viewReadme'], { ns: 'plugin' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- {showSeparator && <DropdownMenuSeparator />}
+ {showSeparator && <MenuSeparator />}
{showRemoveAction && (
- <DropdownMenuItem
+ <MenuItem
className={cn(
'px-2 py-1 system-md-regular text-text-secondary',
destructiveRemove &&
@@ -146,9 +143,9 @@ export function OperationDropdown({
>
{t(($) => $['detailPanel.operation.remove'], { ns: 'plugin' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx b/web/app/components/plugins/plugin-page/__tests__/install-plugin-menu.spec.tsx
similarity index 90%
rename from web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx
rename to web/app/components/plugins/plugin-page/__tests__/install-plugin-menu.spec.tsx
index c18f6e3f14e..468b01f7521 100644
--- a/web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx
+++ b/web/app/components/plugins/plugin-page/__tests__/install-plugin-menu.spec.tsx
@@ -3,7 +3,7 @@ import type { ConsoleQueryTestOptions } from '@/test/console/query-data'
import { screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { renderWithConsoleQuery } from '@/test/console/query-data'
-import InstallPluginDropdown from '../install-plugin-dropdown'
+import InstallPluginMenu from '../install-plugin-menu'
const { upload } = vi.hoisted(() => ({ upload: vi.fn() }))
vi.mock('@/service/plugins', async (importOriginal) => ({
@@ -14,14 +14,14 @@ vi.mock('@/service/plugins', async (importOriginal) => ({
vi.mock('../../install-plugin/hooks/use-refresh-plugin-list', () => ({
default: () => ({ refreshPluginList: vi.fn() }),
}))
-const renderDropdown = (
- props: Partial<ComponentProps<typeof InstallPluginDropdown>> = {},
+const renderMenu = (
+ props: Partial<ComponentProps<typeof InstallPluginMenu>> = {},
systemFeatures: ConsoleQueryTestOptions['systemFeatures'] = { enable_marketplace: true },
) => {
const onSwitchToMarketplaceTab = vi.fn()
return {
...renderWithConsoleQuery(
- <InstallPluginDropdown onSwitchToMarketplaceTab={onSwitchToMarketplaceTab} {...props} />,
+ <InstallPluginMenu onSwitchToMarketplaceTab={onSwitchToMarketplaceTab} {...props} />,
{ systemFeatures },
),
onSwitchToMarketplaceTab,
@@ -36,7 +36,7 @@ const openMenu = async (
it('offers all enabled installation sources and switches to the marketplace', async () => {
const user = userEvent.setup()
- const { onSwitchToMarketplaceTab } = renderDropdown({ triggerLabel: 'Install' })
+ const { onSwitchToMarketplaceTab } = renderMenu({ triggerLabel: 'Install' })
await openMenu(user, 'Install')
expect(screen.getByRole('menuitem', { name: 'plugin.source.github' })).toBeInTheDocument()
expect(screen.getByRole('menuitem', { name: 'plugin.source.local' })).toBeInTheDocument()
@@ -46,7 +46,7 @@ it('offers all enabled installation sources and switches to the marketplace', as
it('prevents opening the menu or selecting a file while installation is disabled', async () => {
const user = userEvent.setup()
- const { container, onSwitchToMarketplaceTab } = renderDropdown({ disabled: true })
+ const { container, onSwitchToMarketplaceTab } = renderMenu({ disabled: true })
const trigger = screen.getByRole('button', { name: 'plugin.installPlugin' })
expect(trigger).toBeDisabled()
await user.click(trigger)
@@ -62,7 +62,7 @@ it('prevents opening the menu or selecting a file while installation is disabled
it('offers only the marketplace when custom installation is restricted', async () => {
const user = userEvent.setup()
- renderDropdown(
+ renderMenu(
{},
{
enable_marketplace: true,
@@ -77,7 +77,7 @@ it('offers only the marketplace when custom installation is restricted', async (
it('opens the GitHub installer and returns to the dropdown when it is cancelled', async () => {
const user = userEvent.setup()
- renderDropdown()
+ renderMenu()
await openMenu(user)
await user.click(screen.getByRole('menuitem', { name: 'plugin.source.github' }))
await screen.findByRole('dialog', { name: 'plugin.installFromGitHub.installPlugin' })
@@ -90,7 +90,7 @@ it('opens the GitHub installer and returns to the dropdown when it is cancelled'
it('passes the selected file to the real installer and permits selecting the same file after closing', async () => {
const user = userEvent.setup()
upload.mockRejectedValue(new Error('Upload unavailable'))
- const { container } = renderDropdown()
+ const { container } = renderMenu()
const input = container.querySelector<HTMLInputElement>('input[type="file"]')!
const file = new File(['content'], 'plugin.difypkg')
const filePicker = vi.spyOn(input, 'click')
diff --git a/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx b/web/app/components/plugins/plugin-page/install-plugin-menu.tsx
similarity index 89%
rename from web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx
rename to web/app/components/plugins/plugin-page/install-plugin-menu.tsx
index 3b6519671f5..d7cf5e54a0b 100644
--- a/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx
+++ b/web/app/components/plugins/plugin-page/install-plugin-menu.tsx
@@ -5,13 +5,13 @@ import type { PluginCategoryEnum } from '@/app/components/plugins/types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { RiAddCircleFill, RiArrowDownSLine } from '@remixicon/react'
import { useSuspenseQuery } from '@tanstack/react-query'
import { noop } from 'es-toolkit/function'
@@ -45,7 +45,7 @@ type InstallMethod = {
action: string
}
-const InstallPluginDropdown = ({
+const InstallPluginMenu = ({
disabled = false,
onSwitchToMarketplaceTab,
popupClassName,
@@ -145,7 +145,7 @@ const InstallPluginDropdown = ({
}
return (
- <DropdownMenu
+ <Menu
open={!disabled && isMenuOpen}
onOpenChange={(open) => setIsMenuOpen(disabled ? false : open)}
modal={false}
@@ -159,7 +159,7 @@ const InstallPluginDropdown = ({
onChange={handleFileChange}
accept={SUPPORT_INSTALL_LOCAL_FILE_EXTENSIONS}
/>
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<Button
variant={triggerVariant}
@@ -175,21 +175,19 @@ const InstallPluginDropdown = ({
</Button>
}
/>
- <DropdownMenuContent align="start" className={cn('w-50 pb-2', popupClassName)}>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>
- {t(($) => $.installFrom, { ns: 'plugin' })}
- </DropdownMenuGroupLabel>
+ <MenuContent align="start" className={cn('w-50 pb-2', popupClassName)}>
+ <MenuGroup>
+ <MenuGroupLabel>{t(($) => $.installFrom, { ns: 'plugin' })}</MenuGroupLabel>
{installMethods.map(({ icon: Icon, text, action }) => (
- <DropdownMenuItem key={action} onClick={() => handleInstallMethodSelect(action)}>
+ <MenuItem key={action} onClick={() => handleInstallMethodSelect(action)}>
<div className="flex items-center gap-1">
<Icon className="size-4 text-text-tertiary" />
<span className="px-1 system-md-regular text-text-secondary">{text}</span>
</div>
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuGroup>
- </DropdownMenuContent>
+ </MenuGroup>
+ </MenuContent>
</div>
{selectedAction === 'github' && (
<InstallFromGitHub
@@ -209,8 +207,8 @@ const InstallPluginDropdown = ({
{/* {pluginLists.map((item: any) => (
<div key={item.id} onClick={() => handleUninstall(item.id)}>{item.name} 卸载</div>
))} */}
- </DropdownMenu>
+ </Menu>
)
}
-export default InstallPluginDropdown
+export default InstallPluginMenu
diff --git a/web/app/components/plugins/plugin-page/nav-operations.tsx b/web/app/components/plugins/plugin-page/nav-operations.tsx
index fa88a8feda0..f39594e4903 100644
--- a/web/app/components/plugins/plugin-page/nav-operations.tsx
+++ b/web/app/components/plugins/plugin-page/nav-operations.tsx
@@ -2,29 +2,29 @@
import type { ReactNode } from 'react'
import type { DocPathWithoutLang } from '@/types/doc-paths'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuLinkItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuLinkItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { Fragment, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { MARKETPLACE_URL_PREFIX } from '@/config'
import { useDocLink } from '@/context/i18n'
-type DropdownItemProps = {
+type GuideMenuItemProps = {
href: string
icon: ReactNode
text: string
}
-function DropdownItem({ href, icon, text }: DropdownItemProps) {
+function GuideMenuItem({ href, icon, text }: GuideMenuItemProps) {
return (
- <DropdownMenuLinkItem
+ <MenuLinkItem
href={href}
target="_blank"
rel="noopener noreferrer"
@@ -33,7 +33,7 @@ function DropdownItem({ href, icon, text }: DropdownItemProps) {
{icon}
<span className="system-sm-medium text-text-secondary">{text}</span>
<span className="ml-auto i-ri-arrow-right-up-line size-4 shrink-0 text-text-tertiary" />
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)
}
@@ -72,29 +72,26 @@ function getOptions(docLink: (path: DocPathWithoutLang) => string): {
]
}
-type SubmitRequestDropdownProps = {
+type SubmitRequestMenuProps = {
dividerAfterFirst?: boolean
}
-type SubmitRequestDropdownMenuProps = SubmitRequestDropdownProps & {
+type SubmitRequestMenuViewProps = SubmitRequestMenuProps & {
docLink: (path: DocPathWithoutLang) => string
}
-// Presentational dropdown. Callers that cannot use useDocLink() -- standalone
+// Presentational menu. Callers that cannot use useDocLink() -- standalone
// Marketplace SSR -- pass a locale-composed docLink instead.
-export function SubmitRequestDropdownMenu({
- dividerAfterFirst,
- docLink,
-}: SubmitRequestDropdownMenuProps) {
+export function SubmitRequestMenuView({ dividerAfterFirst, docLink }: SubmitRequestMenuViewProps) {
const { t } = useTranslation(['plugin'])
const [open, setOpen] = useState(false)
const options = getOptions(docLink)
const guideLabel = t(($) => $['marketplace.home.guide'], { ns: 'plugin' })
return (
- <DropdownMenu open={open} onOpenChange={setOpen}>
+ <Menu open={open} onOpenChange={setOpen}>
<Tooltip disabled={open}>
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<TooltipTrigger
render={
@@ -113,23 +110,23 @@ export function SubmitRequestDropdownMenu({
{guideLabel}
</TooltipContent>
</Tooltip>
- <DropdownMenuContent className="min-w-50 p-1">
+ <MenuContent className="min-w-50">
{options.map((option, index) => (
<Fragment key={option.href}>
- {dividerAfterFirst && index === 1 && <DropdownMenuSeparator className="my-1" />}
- <DropdownItem
+ {dividerAfterFirst && index === 1 && <MenuSeparator className="my-1" />}
+ <GuideMenuItem
href={option.href}
icon={option.icon}
text={t(($) => $[option.labelKey], { ns: 'plugin' })}
/>
</Fragment>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
-export function SubmitRequestDropdown({ dividerAfterFirst }: SubmitRequestDropdownProps) {
+export function SubmitRequestMenu({ dividerAfterFirst }: SubmitRequestMenuProps) {
const docLink = useDocLink()
- return <SubmitRequestDropdownMenu dividerAfterFirst={dividerAfterFirst} docLink={docLink} />
+ return <SubmitRequestMenuView dividerAfterFirst={dividerAfterFirst} docLink={docLink} />
}
diff --git a/web/app/components/provider/__tests__/i18n-hydration.browser.spec.tsx b/web/app/components/provider/__tests__/i18n-hydration.browser.spec.tsx
index 59842b72e5b..94aa403ed44 100644
--- a/web/app/components/provider/__tests__/i18n-hydration.browser.spec.tsx
+++ b/web/app/components/provider/__tests__/i18n-hydration.browser.spec.tsx
@@ -4,7 +4,7 @@ import { hydrateRoot } from 'react-dom/client'
import { renderToReadableStream } from 'react-dom/server.browser'
import { useTranslation } from 'react-i18next'
import { page } from 'vite-plus/test/browser'
-import { CreateAppDropdown } from '@/app/components/app/create-app-dropdown'
+import { CreateAppMenu } from '@/app/components/app/create-app-menu'
import { I18nClientProvider } from '@/app/components/provider/i18n'
import { serializeResourceUpdate } from '@/i18n/streamed-resources'
@@ -32,7 +32,7 @@ function FeaturePage() {
const [open, setOpen] = useState(false)
return (
<>
- <CreateAppDropdown onCreateBlank={() => {}} />
+ <CreateAppMenu onCreateBlank={() => {}} />
<button onClick={() => setOpen(true)}>Show deferred feature</button>
{open && <DeferredFeature />}
</>
diff --git a/web/app/components/share/text-generation/__tests__/menu-dropdown.spec.tsx b/web/app/components/share/text-generation/__tests__/text-generation-menu.spec.tsx
similarity index 91%
rename from web/app/components/share/text-generation/__tests__/menu-dropdown.spec.tsx
rename to web/app/components/share/text-generation/__tests__/text-generation-menu.spec.tsx
index eceb0aec355..db7f7cd7146 100644
--- a/web/app/components/share/text-generation/__tests__/menu-dropdown.spec.tsx
+++ b/web/app/components/share/text-generation/__tests__/text-generation-menu.spec.tsx
@@ -4,7 +4,7 @@ import { render, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
import { AccessMode } from '@/models/access-control'
-import MenuDropdown from '../menu-dropdown'
+import TextGenerationMenu from '../text-generation-menu'
const mockSetTheme = vi.fn()
vi.mock('next-themes', () => ({ useTheme: () => ({ theme: 'system', setTheme: mockSetTheme }) }))
@@ -39,7 +39,7 @@ vi.mock('@/service/webapp-address', () => ({
resolveWebAppAddress: () => webAppAddress,
}))
-describe('MenuDropdown', () => {
+describe('TextGenerationMenu', () => {
const siteInfo: SiteInfo = { title: 'Test App', icon: '🚀', icon_type: 'emoji' }
beforeEach(() => {
mockWebAppLogout.mockResolvedValue(undefined)
@@ -47,7 +47,7 @@ describe('MenuDropdown', () => {
it('exposes the selected theme and keeps the menu open when changing it', async () => {
const user = userEvent.setup()
- render(<MenuDropdown data={siteInfo} />)
+ render(<TextGenerationMenu data={siteInfo} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
expect(screen.getByRole('menuitemradio', { name: 'common.theme.auto' })).toHaveAttribute(
'aria-checked',
@@ -62,7 +62,7 @@ describe('MenuDropdown', () => {
'only links to a configured privacy policy (%s)',
async (privacy_policy) => {
const user = userEvent.setup()
- render(<MenuDropdown data={{ ...siteInfo, privacy_policy }} />)
+ render(<TextGenerationMenu data={{ ...siteInfo, privacy_policy }} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
const link = screen.queryByRole('menuitem', { name: 'share.chat.privacyPolicyMiddle' })
if (privacy_policy) {
@@ -76,7 +76,7 @@ describe('MenuDropdown', () => {
it('hides logout when requested', async () => {
const user = userEvent.setup()
- render(<MenuDropdown data={siteInfo} hideLogout />)
+ render(<TextGenerationMenu data={siteInfo} hideLogout />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
expect(
screen.queryByRole('menuitem', { name: 'common.userProfile.logout' }),
@@ -85,7 +85,7 @@ describe('MenuDropdown', () => {
it('logs out of the current web app and redirects back to its sign-in route', async () => {
const user = userEvent.setup()
- render(<MenuDropdown data={siteInfo} />)
+ render(<TextGenerationMenu data={siteInfo} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByRole('menuitem', { name: 'common.userProfile.logout' }))
await waitFor(() =>
@@ -96,7 +96,7 @@ describe('MenuDropdown', () => {
it('opens app information from the menu and closes the real dialog', async () => {
const user = userEvent.setup()
- render(<MenuDropdown data={siteInfo} />)
+ render(<TextGenerationMenu data={siteInfo} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByRole('menuitem', { name: 'common.userProfile.about' }))
const dialog = await screen.findByRole('dialog', { name: 'Test App' })
diff --git a/web/app/components/share/text-generation/__tests__/text-generation-sidebar.spec.tsx b/web/app/components/share/text-generation/__tests__/text-generation-sidebar.spec.tsx
index ca3ea20132b..22810945029 100644
--- a/web/app/components/share/text-generation/__tests__/text-generation-sidebar.spec.tsx
+++ b/web/app/components/share/text-generation/__tests__/text-generation-sidebar.spec.tsx
@@ -39,7 +39,7 @@ vi.mock('@/app/components/app/text-generate/saved-items', () => ({
},
}))
-vi.mock('@/app/components/share/text-generation/menu-dropdown', () => ({
+vi.mock('@/app/components/share/text-generation/text-generation-menu', () => ({
default: () => <div data-testid="menu-dropdown-mock" />,
}))
diff --git a/web/app/components/share/text-generation/menu-dropdown.tsx b/web/app/components/share/text-generation/text-generation-menu.tsx
similarity index 78%
rename from web/app/components/share/text-generation/menu-dropdown.tsx
rename to web/app/components/share/text-generation/text-generation-menu.tsx
index 1f811b23415..6eabf209578 100644
--- a/web/app/components/share/text-generation/menu-dropdown.tsx
+++ b/web/app/components/share/text-generation/text-generation-menu.tsx
@@ -1,18 +1,18 @@
'use client'
-import type { DropdownMenuContentProps } from '@langgenius/dify-ui/dropdown-menu'
+import type { MenuContentProps } from '@langgenius/dify-ui/menu'
import type { SiteInfo } from '@/models/share'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuGroupLabel,
+ MenuItem,
+ MenuLinkItem,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTheme } from 'next-themes'
import * as React from 'react'
import { useState } from 'react'
@@ -25,13 +25,13 @@ import { webAppLogout } from '@/service/webapp-auth'
import InfoModal from './info-modal'
type Props = Readonly<
- Pick<DropdownMenuContentProps, 'side' | 'align'> & {
+ Pick<MenuContentProps, 'side' | 'align'> & {
data?: SiteInfo
hideLogout?: boolean
}
>
-function MenuDropdown({ data, side, align, hideLogout }: Props) {
+function TextGenerationMenu({ data, side, align, hideLogout }: Props) {
const webAppAccessMode = useWebAppStore((s) => s.webAppAccessMode)
const router = useRouter()
const pathname = usePathname()
@@ -52,8 +52,8 @@ function MenuDropdown({ data, side, align, hideLogout }: Props) {
return (
<>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -64,15 +64,15 @@ function MenuDropdown({ data, side, align, hideLogout }: Props) {
</IconButton>
}
/>
- <DropdownMenuContent side={side} align={align} className="w-56">
- <DropdownMenuRadioGroup
+ <MenuContent side={side} align={align} className="w-56">
+ <MenuRadioGroup
value={theme ?? 'system'}
onValueChange={setTheme}
className="flex items-center gap-2 px-3 system-md-regular text-text-secondary"
>
- <DropdownMenuGroupLabel className="grow px-0 py-0 system-md-regular text-text-secondary normal-case">
+ <MenuGroupLabel className="grow px-0 py-0 system-md-regular text-text-secondary normal-case">
{t(($) => $['theme.theme'], { ns: 'common' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
<div className="flex items-center rounded-[10px] bg-components-segmented-control-bg-normal p-0.5">
{(['system', 'light', 'dark'] as const).map((value, index) => (
<React.Fragment key={value}>
@@ -87,7 +87,7 @@ function MenuDropdown({ data, side, align, hideLogout }: Props) {
}
/>
)}
- <DropdownMenuRadioItem
+ <MenuRadioItem
value={value}
aria-label={t(
($) =>
@@ -113,14 +113,14 @@ function MenuDropdown({ data, side, align, hideLogout }: Props) {
}
/>
</span>
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
</React.Fragment>
))}
</div>
- </DropdownMenuRadioGroup>
- <DropdownMenuSeparator />
+ </MenuRadioGroup>
+ <MenuSeparator />
{data?.privacy_policy && (
- <DropdownMenuLinkItem
+ <MenuLinkItem
className="system-md-regular"
href={data.privacy_policy}
target="_blank"
@@ -129,22 +129,22 @@ function MenuDropdown({ data, side, align, hideLogout }: Props) {
<span className="grow">
{t(($) => $['chat.privacyPolicyMiddle'], { ns: 'share' })}
</span>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)}
- <DropdownMenuItem className="system-md-regular" onClick={handleOpenInfoModal}>
+ <MenuItem className="system-md-regular" onClick={handleOpenInfoModal}>
{t(($) => $['userProfile.about'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
{!(
hideLogout ||
webAppAccessMode === AccessMode.EXTERNAL_MEMBERS ||
webAppAccessMode === AccessMode.PUBLIC
) && (
- <DropdownMenuItem className="system-md-regular" onClick={handleLogout}>
+ <MenuItem className="system-md-regular" onClick={handleLogout}>
{t(($) => $['userProfile.logout'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
{show && (
<InfoModal
isShow={show}
@@ -157,4 +157,4 @@ function MenuDropdown({ data, side, align, hideLogout }: Props) {
</>
)
}
-export default React.memo(MenuDropdown)
+export default React.memo(TextGenerationMenu)
diff --git a/web/app/components/share/text-generation/text-generation-sidebar.tsx b/web/app/components/share/text-generation/text-generation-sidebar.tsx
index 4024348e990..e4c68397a0d 100644
--- a/web/app/components/share/text-generation/text-generation-sidebar.tsx
+++ b/web/app/components/share/text-generation/text-generation-sidebar.tsx
@@ -15,9 +15,9 @@ import Badge from '@/app/components/base/badge'
import { DifyLogo } from '@/app/components/base/logo/dify-logo'
import { appDefaultIconBackground } from '@/config'
import { AccessMode } from '@/models/access-control'
-import MenuDropdown from './menu-dropdown'
import RunBatch from './run-batch'
import RunOnce from './run-once'
+import TextGenerationMenu from './text-generation-menu'
type TextGenerationSidebarProps = {
accessMode: AccessMode
@@ -102,7 +102,7 @@ const TextGenerationSidebar: FC<TextGenerationSidebarProps> = ({
<div className="grow truncate system-md-semibold text-text-secondary">
{siteInfo.title}
</div>
- <MenuDropdown
+ <TextGenerationMenu
hideLogout={isInstalledApp || accessMode === AccessMode.PUBLIC}
data={siteInfo}
/>
diff --git a/web/app/components/snippet-list/components/snippet-card.tsx b/web/app/components/snippet-list/components/snippet-card.tsx
index 5c95aac1455..434490ce1de 100644
--- a/web/app/components/snippet-list/components/snippet-card.tsx
+++ b/web/app/components/snippet-list/components/snippet-card.tsx
@@ -10,13 +10,7 @@ import {
AlertDialogHeader,
AlertDialogTitle,
} from '@langgenius/dify-ui/alert-dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useMemo, useState } from 'react'
@@ -190,8 +184,8 @@ const SnippetCard = ({
{canShowOperations && (
<div className="pointer-events-none absolute top-1/2 right-1.5 flex -translate-y-1/2 items-center opacity-0 transition-opacity group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100 has-data-popup-open:pointer-events-auto has-data-popup-open:opacity-100">
<div className="mx-1 h-3.5 w-px shrink-0 bg-divider-regular" />
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={tCommon(($) => $['operation.moreActionsFor'], {
ns: 'common',
name: snippet.name,
@@ -205,26 +199,26 @@ const SnippetCard = ({
<div className="flex size-8 cursor-pointer items-center justify-center rounded-md">
<span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
</div>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-54">
+ </MenuTrigger>
+ <MenuContent align="end" className="w-54">
{canCreateAndModifySnippet && (
<>
- <DropdownMenuItem className="gap-2 px-3" onClick={handleOpenEditDialog}>
+ <MenuItem className="gap-2 px-3" onClick={handleOpenEditDialog}>
<span className="system-sm-regular text-text-secondary">
{t(($) => $['menu.editInfo'])}
</span>
- </DropdownMenuItem>
- <DropdownMenuItem className="gap-2 px-3" onClick={handleExportSnippet}>
+ </MenuItem>
+ <MenuItem className="gap-2 px-3" onClick={handleExportSnippet}>
<span className="system-sm-regular text-text-secondary">
{t(($) => $['menu.exportSnippet'])}
</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
{canManageSnippet && (
<>
- {canCreateAndModifySnippet && <DropdownMenuSeparator />}
- <DropdownMenuItem
+ {canCreateAndModifySnippet && <MenuSeparator />}
+ <MenuItem
variant="destructive"
className="gap-2 px-3"
onClick={() => setIsDeleteDialogOpen(true)}
@@ -232,11 +226,11 @@ const SnippetCard = ({
<span className="system-sm-regular">
{t(($) => $['menu.deleteSnippet'])}
</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
)}
</div>
diff --git a/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx b/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx
index 2f978295163..356317697b4 100644
--- a/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx
+++ b/web/app/components/snippet-list/components/snippet-publish-status-filter.tsx
@@ -3,13 +3,13 @@
import type { SnippetPublishStatus } from '../query-params'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -40,8 +40,8 @@ const SnippetPublishStatusFilter = ({ value, onChange }: SnippetPublishStatusFil
const triggerLabel = isSelected ? activeOption?.text : defaultLabel
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<button
type="button"
@@ -56,25 +56,25 @@ const SnippetPublishStatusFilter = ({ value, onChange }: SnippetPublishStatusFil
>
<span className="px-1 text-text-tertiary">{triggerLabel}</span>
<span aria-hidden className="i-ri-arrow-down-s-line h-4 w-4 shrink-0 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-55">
- <DropdownMenuRadioGroup<SnippetPublishStatus>
+ </MenuTrigger>
+ <MenuContent align="start" className="w-55">
+ <MenuRadioGroup<SnippetPublishStatus>
value={value}
onValueChange={(nextValue) => onChange(nextValue)}
>
{options.map((option) => (
- <DropdownMenuRadioItem<SnippetPublishStatus>
+ <MenuRadioItem<SnippetPublishStatus>
key={option.value}
value={option.value}
closeOnClick
>
<span>{option.text}</span>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/snippets/components/snippet-sidebar.tsx b/web/app/components/snippets/components/snippet-sidebar.tsx
index b2f33be9b31..281ff3fd762 100644
--- a/web/app/components/snippets/components/snippet-sidebar.tsx
+++ b/web/app/components/snippets/components/snippet-sidebar.tsx
@@ -8,7 +8,7 @@ import { isEqual } from 'es-toolkit/predicate'
import { useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import NavLink from '@/app/components/app-sidebar/nav-link'
-import SnippetInfoDropdown from '@/app/components/app-sidebar/snippet-info/dropdown'
+import SnippetInfoMenu from '@/app/components/app-sidebar/snippet-info/actions-menu'
import ConfigVarModal from '@/app/components/app/configuration/config-var/config-modal'
import Field from '@/app/components/workflow/nodes/_base/components/field'
import VarList from '@/app/components/workflow/nodes/start/components/var-list'
@@ -120,7 +120,7 @@ export const SnippetSidebarContent = ({
{snippet.name}
</div>
</div>
- <SnippetInfoDropdown snippet={snippet} />
+ <SnippetInfoMenu snippet={snippet} />
</div>
{!!snippet.description && (
<div
diff --git a/web/app/components/step-by-step-tour/__tests__/dropdown-menu.spec.tsx b/web/app/components/step-by-step-tour/__tests__/menu.spec.tsx
similarity index 69%
rename from web/app/components/step-by-step-tour/__tests__/dropdown-menu.spec.tsx
rename to web/app/components/step-by-step-tour/__tests__/menu.spec.tsx
index c9f7484b295..e429459bfdc 100644
--- a/web/app/components/step-by-step-tour/__tests__/dropdown-menu.spec.tsx
+++ b/web/app/components/step-by-step-tour/__tests__/menu.spec.tsx
@@ -1,24 +1,16 @@
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import {
- getStepByStepTourDropdownMenuContentProps,
- useStepByStepTourControlledDropdown,
-} from '../dropdown-menu'
+import { getStepByStepTourMenuContentProps, useStepByStepTourControlledMenu } from '../menu'
-function TestDropdown({
+function TestMenu({
allowTriggerCloseWhileControlled,
controlledOpen,
}: {
allowTriggerCloseWhileControlled?: boolean
controlledOpen?: boolean
}) {
- const menu = useStepByStepTourControlledDropdown({
+ const menu = useStepByStepTourControlledMenu({
allowTriggerCloseWhileControlled,
controlledOpen,
})
@@ -36,10 +28,10 @@ function TestDropdown({
)
}
-describe('useStepByStepTourControlledDropdown', () => {
- it('keeps ordinary dropdown toggle behavior when no tour controls it', async () => {
+describe('useStepByStepTourControlledMenu', () => {
+ it('keeps ordinary menu toggle behavior when no tour controls it', async () => {
const user = userEvent.setup()
- render(<TestDropdown />)
+ render(<TestMenu />)
expect(screen.getByText('Menu is closed and uncontrolled')).toBeInTheDocument()
@@ -52,9 +44,9 @@ describe('useStepByStepTourControlledDropdown', () => {
expect(screen.getByText('Menu is closed and uncontrolled')).toBeInTheDocument()
})
- it('opens for a tour step without locking the dropdown open', async () => {
+ it('opens for a tour step without locking the menu open', async () => {
const user = userEvent.setup()
- render(<TestDropdown controlledOpen />)
+ render(<TestMenu controlledOpen />)
expect(screen.getByText('Menu is open and controlled')).toBeInTheDocument()
@@ -63,9 +55,9 @@ describe('useStepByStepTourControlledDropdown', () => {
expect(screen.getByText('Menu is closed and uncontrolled')).toBeInTheDocument()
})
- it('can keep a tour-opened dropdown locked until the tour leaves the step', async () => {
+ it('can keep a tour-opened menu locked until the tour leaves the step', async () => {
const user = userEvent.setup()
- render(<TestDropdown controlledOpen allowTriggerCloseWhileControlled={false} />)
+ render(<TestMenu controlledOpen allowTriggerCloseWhileControlled={false} />)
expect(screen.getByText('Menu is open and controlled')).toBeInTheDocument()
@@ -74,12 +66,12 @@ describe('useStepByStepTourControlledDropdown', () => {
expect(screen.getByText('Menu is open and controlled')).toBeInTheDocument()
})
- it('closes when the tour leaves the dropdown step', async () => {
- const { rerender } = render(<TestDropdown controlledOpen />)
+ it('closes when the tour leaves the menu step', async () => {
+ const { rerender } = render(<TestMenu controlledOpen />)
expect(screen.getByText('Menu is open and controlled')).toBeInTheDocument()
- rerender(<TestDropdown />)
+ rerender(<TestMenu />)
await waitFor(() => {
expect(screen.getByText('Menu is closed and uncontrolled')).toBeInTheDocument()
@@ -87,23 +79,23 @@ describe('useStepByStepTourControlledDropdown', () => {
})
})
-describe('getStepByStepTourDropdownMenuContentProps', () => {
+describe('getStepByStepTourMenuContentProps', () => {
it('blocks presentation menu interactions without letting clicks bubble through', () => {
const onAction = vi.fn()
const onBackgroundClick = vi.fn()
render(
- <DropdownMenu open>
- <DropdownMenuTrigger>Open menu</DropdownMenuTrigger>
- <DropdownMenuContent
- {...getStepByStepTourDropdownMenuContentProps({
+ <Menu open>
+ <MenuTrigger>Open menu</MenuTrigger>
+ <MenuContent
+ {...getStepByStepTourMenuContentProps({
highlightPart: 'tour-menu',
interactionMode: 'presentation',
})}
>
- <DropdownMenuItem onClick={onAction}>Delete</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <MenuItem onClick={onAction}>Delete</MenuItem>
+ </MenuContent>
+ </Menu>,
)
document.addEventListener('click', onBackgroundClick)
try {
@@ -128,17 +120,17 @@ describe('getStepByStepTourDropdownMenuContentProps', () => {
const onBackgroundClick = vi.fn()
render(
- <DropdownMenu open>
- <DropdownMenuTrigger>Open menu</DropdownMenuTrigger>
- <DropdownMenuContent
- {...getStepByStepTourDropdownMenuContentProps({
+ <Menu open>
+ <MenuTrigger>Open menu</MenuTrigger>
+ <MenuContent
+ {...getStepByStepTourMenuContentProps({
highlightPart: 'tour-menu',
interactionMode: 'interactive',
})}
>
- <DropdownMenuItem onClick={onAction}>Create</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <MenuItem onClick={onAction}>Create</MenuItem>
+ </MenuContent>
+ </Menu>,
)
document.addEventListener('click', onBackgroundClick)
try {
diff --git a/web/app/components/step-by-step-tour/dropdown-menu.ts b/web/app/components/step-by-step-tour/menu.ts
similarity index 78%
rename from web/app/components/step-by-step-tour/dropdown-menu.ts
rename to web/app/components/step-by-step-tour/menu.ts
index 8942cf9e6d4..ca03a9af610 100644
--- a/web/app/components/step-by-step-tour/dropdown-menu.ts
+++ b/web/app/components/step-by-step-tour/menu.ts
@@ -1,4 +1,4 @@
-import type { DropdownMenuContentProps } from '@langgenius/dify-ui/dropdown-menu'
+import type { MenuContentProps } from '@langgenius/dify-ui/menu'
import type { SyntheticEvent } from 'react'
import { cn } from '@langgenius/dify-ui/cn'
import { useCallback, useState } from 'react'
@@ -8,7 +8,7 @@ const STEP_BY_STEP_TOUR_MENU_POPUP_NO_MOTION_CLASS_NAME =
'transition-none data-starting-style:scale-100 data-starting-style:opacity-100 data-ending-style:scale-100 data-ending-style:opacity-100'
const STEP_BY_STEP_TOUR_MENU_PRESENTATION_CLASS_NAME = 'pointer-events-none cursor-default'
-type StepByStepTourDropdownMenuContentProps = {
+type StepByStepTourMenuContentProps = {
highlightPart?: string
disableMotion?: boolean
interactionMode?: 'interactive' | 'presentation'
@@ -24,13 +24,13 @@ const stopMenuEventPropagation = (event: SyntheticEvent) => {
event.stopPropagation()
}
-export const getStepByStepTourDropdownMenuContentProps = ({
+export const getStepByStepTourMenuContentProps = ({
highlightPart,
disableMotion = false,
interactionMode = 'interactive',
className,
-}: StepByStepTourDropdownMenuContentProps): Pick<
- DropdownMenuContentProps,
+}: StepByStepTourMenuContentProps): Pick<
+ MenuContentProps,
| 'aria-hidden'
| 'className'
| 'onClick'
@@ -64,20 +64,20 @@ export const getStepByStepTourDropdownMenuContentProps = ({
}
}
-type StepByStepTourControlledDropdownOptions = {
+type StepByStepTourControlledMenuOptions = {
allowTriggerCloseWhileControlled?: boolean
controlledOpen?: boolean
}
-type StepByStepTourControlledDropdownState = {
+type StepByStepTourControlledMenuState = {
controlledOpen?: boolean
open: boolean
}
-const getNextDropdownStateForControlledOpen = (
- state: StepByStepTourControlledDropdownState,
+const getNextMenuStateForControlledOpen = (
+ state: StepByStepTourControlledMenuState,
controlledOpen: boolean | undefined,
-): StepByStepTourControlledDropdownState => {
+): StepByStepTourControlledMenuState => {
if (state.controlledOpen === controlledOpen) return state
return {
@@ -91,21 +91,21 @@ const getNextDropdownStateForControlledOpen = (
}
}
-export const useStepByStepTourControlledDropdown = ({
+export const useStepByStepTourControlledMenu = ({
allowTriggerCloseWhileControlled = true,
controlledOpen,
-}: StepByStepTourControlledDropdownOptions = {}) => {
- const [state, setState] = useState<StepByStepTourControlledDropdownState>(() => ({
+}: StepByStepTourControlledMenuOptions = {}) => {
+ const [state, setState] = useState<StepByStepTourControlledMenuState>(() => ({
controlledOpen,
open: controlledOpen === true,
}))
- const normalizedState = getNextDropdownStateForControlledOpen(state, controlledOpen)
+ const normalizedState = getNextMenuStateForControlledOpen(state, controlledOpen)
if (normalizedState !== state) setState(normalizedState)
const onOpenChange = useCallback(
(nextOpen: boolean) => {
setState((currentState) => {
- const nextState = getNextDropdownStateForControlledOpen(currentState, controlledOpen)
+ const nextState = getNextMenuStateForControlledOpen(currentState, controlledOpen)
if (nextState.controlledOpen && !allowTriggerCloseWhileControlled && !nextOpen)
return nextState
diff --git a/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx b/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
index 3dc8896371d..afbf3c57881 100644
--- a/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
@@ -1,13 +1,8 @@
'use client'
import type { FC } from 'react'
import { Button } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import * as React from 'react'
import { useState } from 'react'
@@ -88,16 +83,16 @@ const GetSchema: FC<Props> = ({ onChange }) => {
</form>
</PopoverContent>
</Popover>
- <DropdownMenu>
- <DropdownMenuTrigger render={<Button size="small" />}>
+ <Menu>
+ <MenuTrigger render={<Button size="small" />}>
<span className="system-xs-medium text-text-secondary">
{t(($) => $['createTool.examples'], { ns: 'tools' })}
</span>
<span className="i-ri-arrow-down-s-line size-3" aria-hidden />
- </DropdownMenuTrigger>
- <DropdownMenuContent sideOffset={2} className="min-w-max">
+ </MenuTrigger>
+ <MenuContent align="end" sideOffset={2} className="min-w-max">
{examples.map((item) => (
- <DropdownMenuItem
+ <MenuItem
key={item.key}
onClick={() => {
onChange(item.content)
@@ -105,10 +100,10 @@ const GetSchema: FC<Props> = ({ onChange }) => {
className="system-sm-regular whitespace-nowrap text-text-secondary"
>
{t(($) => $[`createTool.exampleOptions.${item.key}`], { ns: 'tools' })}
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
)
}
diff --git a/web/app/components/tools/mcp/detail/__tests__/operation-dropdown.spec.tsx b/web/app/components/tools/mcp/detail/__tests__/operation-menu.spec.tsx
similarity index 85%
rename from web/app/components/tools/mcp/detail/__tests__/operation-dropdown.spec.tsx
rename to web/app/components/tools/mcp/detail/__tests__/operation-menu.spec.tsx
index 90c918e2fff..661b29c0e22 100644
--- a/web/app/components/tools/mcp/detail/__tests__/operation-dropdown.spec.tsx
+++ b/web/app/components/tools/mcp/detail/__tests__/operation-menu.spec.tsx
@@ -1,12 +1,12 @@
import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import OperationDropdown from '../operation-dropdown'
+import OperationMenu from '../operation-menu'
it.each(['edit', 'remove'])('dispatches only %s and closes the menu', async (action) => {
const user = userEvent.setup()
const onEdit = vi.fn()
const onRemove = vi.fn()
- render(<OperationDropdown onEdit={onEdit} onRemove={onRemove} />)
+ render(<OperationMenu onEdit={onEdit} onRemove={onRemove} />)
await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
await user.click(screen.getByRole('menuitem', { name: `tools.mcp.operation.${action}` }))
expect(action === 'edit' ? onEdit : onRemove).toHaveBeenCalledOnce()
diff --git a/web/app/components/tools/mcp/detail/content.tsx b/web/app/components/tools/mcp/detail/content.tsx
index c20d0cf83c4..3d8f027e422 100644
--- a/web/app/components/tools/mcp/detail/content.tsx
+++ b/web/app/components/tools/mcp/detail/content.tsx
@@ -28,7 +28,7 @@ import { openOAuthPopup } from '@/hooks/use-oauth'
import { consoleQuery } from '@/service/console'
import { selectToolProviderTools } from '../../utils/query-select'
import ListLoading from './list-loading'
-import OperationDropdown from './operation-dropdown'
+import OperationMenu from './operation-menu'
import ToolItem from './tool-item'
type Props = Readonly<{
@@ -176,7 +176,7 @@ const MCPDetailContent: FC<Props> = ({
</div>
<div className="flex gap-1">
{canManageMCP && (
- <OperationDropdown
+ <OperationMenu
onEdit={() => onEdit(detail.id)}
onRemove={() => onDelete(detail.id)}
/>
diff --git a/web/app/components/tools/mcp/detail/operation-dropdown.tsx b/web/app/components/tools/mcp/detail/operation-menu.tsx
similarity index 71%
rename from web/app/components/tools/mcp/detail/operation-dropdown.tsx
rename to web/app/components/tools/mcp/detail/operation-menu.tsx
index 382c092a06a..73cc691fdd3 100644
--- a/web/app/components/tools/mcp/detail/operation-dropdown.tsx
+++ b/web/app/components/tools/mcp/detail/operation-menu.tsx
@@ -1,13 +1,8 @@
'use client'
import type { FC } from 'react'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
@@ -18,12 +13,12 @@ type Props = Readonly<{
onRemove: () => void
}>
-const OperationDropdown: FC<Props> = ({ inCard, onOpenChange, onEdit, onRemove }) => {
+const OperationMenu: FC<Props> = ({ inCard, onOpenChange, onEdit, onRemove }) => {
const { t } = useTranslation(['common', 'tools'])
return (
- <DropdownMenu onOpenChange={onOpenChange}>
- <DropdownMenuTrigger
+ <Menu onOpenChange={onOpenChange}>
+ <MenuTrigger
render={
<IconButton
size={inCard ? 'lg' : 'md'}
@@ -34,14 +29,14 @@ const OperationDropdown: FC<Props> = ({ inCard, onOpenChange, onEdit, onRemove }
</IconButton>
}
/>
- <DropdownMenuContent className="w-40">
- <DropdownMenuItem onClick={onEdit}>
+ <MenuContent align="end" className="w-40">
+ <MenuItem onClick={onEdit}>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-tertiary" />
<div className="ms-2 system-md-regular text-text-secondary">
{t(($) => $['mcp.operation.edit'], { ns: 'tools' })}
</div>
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
className="data-highlighted:bg-state-destructive-hover data-highlighted:text-text-destructive"
onClick={onRemove}
>
@@ -49,9 +44,9 @@ const OperationDropdown: FC<Props> = ({ inCard, onOpenChange, onEdit, onRemove }
<div className="ms-2 system-md-regular text-inherit">
{t(($) => $['mcp.operation.remove'], { ns: 'tools' })}
</div>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)
}
-export default React.memo(OperationDropdown)
+export default React.memo(OperationMenu)
diff --git a/web/app/components/tools/mcp/provider-card.tsx b/web/app/components/tools/mcp/provider-card.tsx
index 1838788fc1d..eff16f7b9d9 100644
--- a/web/app/components/tools/mcp/provider-card.tsx
+++ b/web/app/components/tools/mcp/provider-card.tsx
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'
import Icon from '@/app/components/plugins/card/base/card-icon'
import { useCanManageMCP } from '@/app/components/tools/hooks/use-tool-permissions'
import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'
-import OperationDropdown from './detail/operation-dropdown'
+import OperationMenu from './detail/operation-menu'
type Props = Readonly<{
currentProvider?: ToolWithProvider
@@ -108,7 +108,7 @@ const MCPCard = ({ currentProvider, data, onEdit, onDelete, handleSelect }: Prop
isOperationShow && 'block',
)}
>
- <OperationDropdown
+ <OperationMenu
inCard
onOpenChange={setIsOperationShow}
onEdit={() => onEdit(data.id)}
diff --git a/web/app/components/workflow/block-selector/agent-selector.tsx b/web/app/components/workflow/block-selector/agent-selector.tsx
index 935bdbf27a6..5082a7ac51c 100644
--- a/web/app/components/workflow/block-selector/agent-selector.tsx
+++ b/web/app/components/workflow/block-selector/agent-selector.tsx
@@ -1,22 +1,22 @@
import type { AgentInviteOptionResponse } from '@dify/contracts/api/console/agent/types.gen'
-import type { DropdownMenuContentProps } from '@langgenius/dify-ui/dropdown-menu'
+import type { MenuContentProps } from '@langgenius/dify-ui/menu'
import type { ReactNode } from 'react'
import type { NodeDefault } from '../types'
import type { AgentRosterNodeData } from './types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuFilterProvider,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuList,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuFilterProvider,
+ MenuInput,
+ MenuInputGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuList,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { keepPreviousData, useQuery } from '@tanstack/react-query'
import { useDebounce } from 'ahooks'
import { useAtomValue } from 'jotai'
@@ -43,17 +43,17 @@ export function AgentSelectorMenu({ children }: { children: ReactNode }) {
const [searchText, setSearchText] = useState('')
return (
- <DropdownMenuFilterProvider filter={null} value={searchText} onValueChange={setSearchText}>
- <DropdownMenu>
+ <MenuFilterProvider filter={null} value={searchText} onValueChange={setSearchText}>
+ <Menu>
<SearchTextContext value={searchText}>{children}</SearchTextContext>
- </DropdownMenu>
- </DropdownMenuFilterProvider>
+ </Menu>
+ </MenuFilterProvider>
)
}
-export const AgentSelectorMenuTrigger = DropdownMenuTrigger
+export const AgentSelectorMenuTrigger = MenuTrigger
-type AgentSelectorMenuContentProps = Pick<DropdownMenuContentProps, 'side' | 'align'> & {
+type AgentSelectorMenuContentProps = Pick<MenuContentProps, 'side' | 'align'> & {
onSelect: (agent: AgentRosterNodeData) => void
onStartFromScratch?: () => void
}
@@ -67,14 +67,14 @@ export function AgentSelectorMenuContent({
const { t } = useTranslation(['agentRoster'])
return (
- <DropdownMenuContent
+ <MenuContent
side={side}
align={align}
aria-label={t(($) => $['roster.nodeSelector.dialogLabel'], { ns: 'agentRoster' })}
className="w-60"
>
<AgentSelectorList onSelect={onSelect} onStartFromScratch={onStartFromScratch} />
- </DropdownMenuContent>
+ </MenuContent>
)
}
@@ -124,16 +124,16 @@ function AgentSelectorList({
return (
<>
- <DropdownMenuInputGroup>
+ <MenuInputGroup>
<span
aria-hidden
className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
/>
- <DropdownMenuInput
+ <MenuInput
aria-label={t(($) => $['roster.searchLabel'], { ns: 'agentRoster' })}
placeholder={t(($) => $['roster.nodeSelector.searchPlaceholder'], { ns: 'agentRoster' })}
/>
- </DropdownMenuInputGroup>
+ </MenuInputGroup>
{/* A persistent live region announces reliably. The skeleton already shows loading, so that
status is announced but not displayed. */}
<div
@@ -147,7 +147,7 @@ function AgentSelectorList({
</div>
{/* The agents scroll inside the list so the footer actions stay in view. The scroller is kept
out of the tab order: the menu owns focus and Tab closes it. */}
- <DropdownMenuList className="flex max-h-none flex-col overflow-visible">
+ <MenuList className="flex max-h-none flex-col overflow-visible">
<div
tabIndex={-1}
className={cn(
@@ -160,7 +160,7 @@ function AgentSelectorList({
) : (
!agentsQuery.isError &&
agents.map((agent) => (
- <DropdownMenuItem
+ <MenuItem
key={agent.id}
closeOnClick={Boolean(agent.active_config_snapshot_id)}
className="h-auto gap-2 py-1.5 pr-3 pl-2"
@@ -177,20 +177,20 @@ function AgentSelectorList({
{agent.role || agent.description}
</span>
</span>
- </DropdownMenuItem>
+ </MenuItem>
))
)}
</div>
- <DropdownMenuSeparator className="shrink-0" />
+ <MenuSeparator className="shrink-0" />
{onStartFromScratch && (
- <DropdownMenuItem className="shrink-0" onClick={onStartFromScratch}>
+ <MenuItem className="shrink-0" onClick={onStartFromScratch}>
<span aria-hidden className="i-ri-add-line size-4 shrink-0 text-text-tertiary" />
<span className="min-w-0 flex-1 truncate">
{t(($) => $['roster.nodeSelector.startFromScratch'], { ns: 'agentRoster' })}
</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- <DropdownMenuLinkItem
+ <MenuLinkItem
className="shrink-0"
render={<Link href="/agents" target="_blank" rel="noopener noreferrer" />}
>
@@ -201,8 +201,8 @@ function AgentSelectorList({
<span className="min-w-0 flex-1 truncate">
{t(($) => $['roster.nodeSelector.manageInAgentConsole'], { ns: 'agentRoster' })}
</span>
- </DropdownMenuLinkItem>
- </DropdownMenuList>
+ </MenuLinkItem>
+ </MenuList>
</>
)
}
diff --git a/web/app/components/workflow/block-selector/marketplace-plugin/__tests__/action.spec.tsx b/web/app/components/workflow/block-selector/marketplace-plugin/__tests__/action.spec.tsx
index 270fed58230..ca82515bbea 100644
--- a/web/app/components/workflow/block-selector/marketplace-plugin/__tests__/action.spec.tsx
+++ b/web/app/components/workflow/block-selector/marketplace-plugin/__tests__/action.spec.tsx
@@ -3,7 +3,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
-import OperationDropdown from '../action'
+import OperationMenu from '../action'
const mockDownloadBlob = vi.fn()
const mockDownloadPlugin = vi.fn()
@@ -42,12 +42,12 @@ const createQueryClient = () =>
},
})
-const renderComponent = (props?: Partial<ComponentProps<typeof OperationDropdown>>) => {
+const renderComponent = (props?: Partial<ComponentProps<typeof OperationMenu>>) => {
const queryClient = createQueryClient()
return render(
<QueryClientProvider client={queryClient}>
- <OperationDropdown
+ <OperationMenu
open={false}
onOpenChange={vi.fn()}
author="langgenius"
@@ -59,7 +59,7 @@ const renderComponent = (props?: Partial<ComponentProps<typeof OperationDropdown
)
}
-describe('MarketplaceOperationDropdown', () => {
+describe('MarketplaceOperationMenu', () => {
beforeEach(() => {
vi.clearAllMocks()
mockDownloadPlugin.mockResolvedValue(new Blob(['plugin zip'], { type: 'application/zip' }))
diff --git a/web/app/components/workflow/block-selector/marketplace-plugin/action.tsx b/web/app/components/workflow/block-selector/marketplace-plugin/action.tsx
index 511e3f80c8a..9416a3e4776 100644
--- a/web/app/components/workflow/block-selector/marketplace-plugin/action.tsx
+++ b/web/app/components/workflow/block-selector/marketplace-plugin/action.tsx
@@ -1,12 +1,6 @@
'use client'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuLinkItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation } from '@tanstack/react-query'
import { useTheme } from 'next-themes'
import { memo } from 'react'
@@ -23,7 +17,7 @@ type Props = Readonly<{
version: string
}>
-function OperationDropdown({ open, onOpenChange, author, name, version }: Props) {
+function OperationMenu({ open, onOpenChange, author, name, version }: Props) {
const { t } = useTranslation(['common'])
const { theme } = useTheme()
@@ -49,8 +43,8 @@ function OperationDropdown({ open, onOpenChange, author, name, version }: Props)
}
return (
- <DropdownMenu open={open} onOpenChange={onOpenChange}>
- <DropdownMenuTrigger
+ <Menu open={open} onOpenChange={onOpenChange}>
+ <MenuTrigger
render={
<IconButton
variant="ghost"
@@ -65,21 +59,21 @@ function OperationDropdown({ open, onOpenChange, author, name, version }: Props)
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-44">
- <DropdownMenuItem className="system-md-regular" onClick={handleDownload}>
+ <MenuContent align="end" className="min-w-44">
+ <MenuItem className="system-md-regular" onClick={handleDownload}>
{t(($) => $['operation.download'], { ns: 'common' })}
- </DropdownMenuItem>
- <DropdownMenuLinkItem
+ </MenuItem>
+ <MenuLinkItem
className="system-md-regular"
href={getMarketplaceUrl(`/plugins/${author}/${name}`, { theme })}
target="_blank"
rel="noopener noreferrer"
>
{t(($) => $['operation.viewDetails'], { ns: 'common' })}
- </DropdownMenuLinkItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuLinkItem>
+ </MenuContent>
+ </Menu>
)
}
-export default memo(OperationDropdown)
+export default memo(OperationMenu)
diff --git a/web/app/components/workflow/comment/thread.tsx b/web/app/components/workflow/comment/thread.tsx
index 7347d3de801..a61a7b9c6e9 100644
--- a/web/app/components/workflow/comment/thread.tsx
+++ b/web/app/components/workflow/comment/thread.tsx
@@ -17,12 +17,7 @@ import {
} from '@langgenius/dify-ui/alert-dialog'
import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Separator } from '@langgenius/dify-ui/separator'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import {
@@ -402,7 +397,7 @@ function CommentThreadComponent({
const previousReplyCountRef = useRef<number | undefined>(undefined)
const previousCommentIdRef = useRef<string | undefined>(undefined)
- // Close dropdown when scrolling
+ // Close menu when scrolling
useEffect(() => {
const container = messageListRef.current
if (!container || !activeReplyMenuId) return
@@ -573,20 +568,20 @@ function CommentThreadComponent({
<div ref={messageListRef} className="relative mt-2 flex-1 overflow-y-auto px-4 pb-4">
<div className="group relative -mx-4 rounded-lg px-4 py-2 transition-colors hover:bg-components-panel-on-panel-item-bg-hover">
{isOwnComment && !isCommentEditing && (
- <DropdownMenu
+ <Menu
open={activeReplyMenuId === comment.id}
onOpenChange={(open) => setActiveReplyMenuId(open ? comment.id : null)}
>
- <DropdownMenuTrigger
+ <MenuTrigger
className="absolute top-1 right-1 flex size-6 items-center justify-center rounded-md text-text-tertiary opacity-0 group-hover:opacity-100 hover:bg-state-base-hover hover:text-text-secondary focus:opacity-100 data-popup-open:opacity-100 [@media(hover:none)]:opacity-100"
aria-label={t(($) => $['comments.aria.commentActions'], {
ns: 'workflowComments',
})}
>
<RiMoreFill className="size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-36 backdrop-blur-[10px]">
- <DropdownMenuItem
+ </MenuTrigger>
+ <MenuContent align="end" className="w-36 backdrop-blur-[10px]">
+ <MenuItem
className="px-3"
onClick={(e) => {
e.stopPropagation()
@@ -594,9 +589,9 @@ function CommentThreadComponent({
}}
>
{t(($) => $['comments.actions.editComment'], { ns: 'workflowComments' })}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
{isCommentEditing ? (
<div className="flex gap-3 pt-1">
@@ -655,13 +650,13 @@ function CommentThreadComponent({
className="group relative -mx-4 rounded-lg px-4 py-2 transition-colors hover:bg-components-panel-on-panel-item-bg-hover"
>
{isOwnReply && !isReplyEditing && (
- <DropdownMenu
+ <Menu
open={activeReplyMenuId === reply.id}
onOpenChange={(open) => {
setActiveReplyMenuId(open ? reply.id : null)
}}
>
- <DropdownMenuTrigger
+ <MenuTrigger
ref={(element: HTMLButtonElement | null) => {
if (element) replyMenuTriggersRef.current.set(reply.id, element)
else replyMenuTriggersRef.current.delete(reply.id)
@@ -673,9 +668,13 @@ function CommentThreadComponent({
})}
>
<RiMoreFill className="size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-36 backdrop-blur-[10px]" data-reply-menu>
- <DropdownMenuItem
+ </MenuTrigger>
+ <MenuContent
+ align="end"
+ className="w-36 backdrop-blur-[10px]"
+ data-reply-menu
+ >
+ <MenuItem
onClick={(event) => {
event.stopPropagation()
handleStartEdit(reply)
@@ -684,8 +683,8 @@ function CommentThreadComponent({
{t(($) => $['comments.actions.editReply'], {
ns: 'workflowComments',
})}
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
variant="destructive"
onClick={(event) => {
event.stopPropagation()
@@ -700,9 +699,9 @@ function CommentThreadComponent({
{t(($) => $['comments.actions.deleteReply'], {
ns: 'workflowComments',
})}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
{isReplyEditing ? (
<div className="flex gap-3 pt-1">
diff --git a/web/app/components/workflow/edge-contextmenu.tsx b/web/app/components/workflow/edge-contextmenu.tsx
index 9039f5ae1f6..d74586bdb46 100644
--- a/web/app/components/workflow/edge-contextmenu.tsx
+++ b/web/app/components/workflow/edge-contextmenu.tsx
@@ -26,7 +26,6 @@ export function EdgeContextmenu({ onClose }: { onClose: () => void }) {
return (
<ContextMenuContent
className="rounded-lg"
- sideOffset={4}
onKeyDown={(event) => {
if (getNodesReadOnly()) return
handleWorkflowMenuKeyDown(event, [['workflow.delete', deleteEdge]])
diff --git a/web/app/components/workflow/header/test-run-menu.tsx b/web/app/components/workflow/header/test-run-menu.tsx
index 08f0e5e96e2..b347d6fae7f 100644
--- a/web/app/components/workflow/header/test-run-menu.tsx
+++ b/web/app/components/workflow/header/test-run-menu.tsx
@@ -1,13 +1,13 @@
import type { ShortcutMapping } from './test-run-menu-helpers'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import {
forwardRef,
isValidElement,
@@ -66,7 +66,7 @@ const OptionRow = ({
onSelect: (option: TriggerOption) => void
}) => {
return (
- <DropdownMenuItem
+ <MenuItem
className="h-auto gap-3 px-3 py-1.5 system-md-regular"
onClick={() => onSelect(option)}
>
@@ -75,7 +75,7 @@ const OptionRow = ({
<span className="truncate">{option.name}</span>
</div>
{shortcutKey && <ShortcutKbd displayKey={shortcutKey} textColor="secondary" />}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -183,29 +183,27 @@ const TestRunMenu = forwardRef<TestRunMenuRef, TestRunMenuProps>(
}
return (
- <DropdownMenu open={open} onOpenChange={setOpen}>
+ <Menu open={open} onOpenChange={setOpen}>
{isValidElement(children) ? (
- <DropdownMenuTrigger render={children} style={{ userSelect: 'none' }} />
+ <MenuTrigger render={children} style={{ userSelect: 'none' }} />
) : (
- <DropdownMenuTrigger style={{ userSelect: 'none' }}>{children}</DropdownMenuTrigger>
+ <MenuTrigger style={{ userSelect: 'none' }}>{children}</MenuTrigger>
)}
- <DropdownMenuContent
+ <MenuContent
onKeyDown={(event) => handleShortcutMenuKeyDown(event, shortcutMappings, handleSelect)}
align="start"
sideOffset={8}
alignOffset={-4}
- className="w-71 px-1"
+ className="w-71"
>
- <DropdownMenuGroup className="flex flex-col gap-1">
- <DropdownMenuGroupLabel className="pt-2 text-sm font-medium text-text-primary">
+ <MenuGroup className="flex flex-col gap-1">
+ <MenuGroupLabel className="pt-2 text-sm font-medium text-text-primary">
{t(($) => $['common.chooseStartNodeToRun'], { ns: 'workflow' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
<div>
{hasUserInput && renderOption(options.userInput!)}
- {(hasTriggers || hasRunAll) && hasUserInput && (
- <DropdownMenuSeparator className="mx-3" />
- )}
+ {(hasTriggers || hasRunAll) && hasUserInput && <MenuSeparator className="mx-3" />}
{hasRunAll && renderOption(options.runAll!)}
@@ -214,9 +212,9 @@ const TestRunMenu = forwardRef<TestRunMenuRef, TestRunMenuProps>(
.filter((trigger) => trigger.enabled !== false)
.map((trigger) => renderOption(trigger))}
</div>
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
)
},
)
diff --git a/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx b/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx
index dc004edbca7..9d1ff50c37f 100644
--- a/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx
+++ b/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx
@@ -11,7 +11,7 @@ import { BlockClassification } from '../../block-selector/types'
import { useAvailableBlocks } from '../../hooks/use-available-blocks'
import { useNodesInteractions } from '../../hooks/use-nodes-interactions'
import { useNodeMetaData } from '../../hooks/use-nodes-meta-data'
-import { NodeActionsDropdown } from '../index'
+import { NodeActionsMenu } from '../index'
vi.mock('../../hooks/use-available-blocks', async (importOriginal) => {
const actual = await importOriginal<typeof import('../../hooks/use-available-blocks')>()
@@ -66,7 +66,7 @@ const mockUseAvailableBlocks = vi.mocked(useAvailableBlocks)
const mockUseNodeMetaData = vi.mocked(useNodeMetaData)
const mockUseNodesInteractions = vi.mocked(useNodesInteractions)
-async function renderDropdownContent(
+async function renderMenuContent(
user: ReturnType<typeof userEvent.setup>,
{
showHelpLink = true,
@@ -79,7 +79,7 @@ async function renderDropdownContent(
} = {},
) {
const result = renderWorkflowFlowComponent(
- <NodeActionsDropdown
+ <NodeActionsMenu
id="node-1"
data={{ type: BlockEnum.Code, title: 'Code Node', desc: '', ...data }}
onOpenChange={(open) => !open && onClose()}
@@ -163,10 +163,7 @@ describe('node actions menu details', () => {
it('keeps the menu after Escape and closes both surfaces after changing a node', async () => {
const user = userEvent.setup()
renderWorkflowFlowComponent(
- <NodeActionsDropdown
- id="node-1"
- data={{ type: BlockEnum.Code, title: 'Code Node', desc: '' }}
- />,
+ <NodeActionsMenu id="node-1" data={{ type: BlockEnum.Code, title: 'Code Node', desc: '' }} />,
{
resource: {
kind: 'app',
@@ -247,7 +244,7 @@ describe('node actions menu details', () => {
it('links the help menu item to the node documentation', async () => {
const user = userEvent.setup()
- await renderDropdownContent(user)
+ await renderMenuContent(user)
expect(screen.getByRole('menuitem', { name: 'workflow.panel.helpLink' })).toHaveAttribute(
'href',
@@ -257,7 +254,7 @@ describe('node actions menu details', () => {
it('should stop the current single run from the run action when the node is running', async () => {
const user = userEvent.setup()
- const { store } = await renderDropdownContent(user, {
+ const { store } = await renderMenuContent(user, {
data: {
_singleRunningStatus: NodeRunningStatus.Running,
},
@@ -280,7 +277,7 @@ describe('node actions menu details', () => {
author: 'Dify',
} as ReturnType<typeof useNodeMetaData>)
- await renderDropdownContent(user, { showHelpLink: false })
+ await renderMenuContent(user, { showHelpLink: false })
expect(screen.getByText('workflow.panel.runThisStep')).toBeInTheDocument()
expect(
@@ -300,7 +297,7 @@ describe('node actions menu details', () => {
]
renderWorkflowFlowComponent(
- <NodeActionsDropdown
+ <NodeActionsMenu
id="node-2"
data={{
type: BlockEnum.Tool,
@@ -361,7 +358,7 @@ describe('node actions menu details', () => {
it('removes editing and run actions when the canvas becomes readonly', async () => {
const user = userEvent.setup()
- const { store } = await renderDropdownContent(user)
+ const { store } = await renderMenuContent(user)
expect(screen.getByRole('menuitem', { name: 'workflow.panel.runThisStep' })).toBeInTheDocument()
expect(screen.getByRole('menuitem', { name: /workflow.common.copy/ })).toBeInTheDocument()
diff --git a/web/app/components/workflow/node-actions-menu/__tests__/index.spec.tsx b/web/app/components/workflow/node-actions-menu/__tests__/index.spec.tsx
index 0f91f0dd8c1..76bd5387f1e 100644
--- a/web/app/components/workflow/node-actions-menu/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/node-actions-menu/__tests__/index.spec.tsx
@@ -11,7 +11,7 @@ import { BlockEnum } from '@/app/components/workflow/types'
import { seedModelProviderQueries } from '@/test/console/model-provider'
import { createConsoleQueryWrapper } from '@/test/console/query-data'
import { useNodeMetaData } from '../../hooks/use-nodes-meta-data'
-import { NodeActionsDropdown } from '../index'
+import { NodeActionsMenu } from '../index'
// Node metadata comes from the per-app block registry, which has its own suite.
vi.mock('../../hooks/use-nodes-meta-data', async (importOriginal) => {
@@ -50,7 +50,7 @@ const renderComponent = (
seedModelProviderQueries(queryClient)
return renderWorkflowFlowComponent(
<>
- <NodeActionsDropdown
+ <NodeActionsMenu
id="node-1"
data={{
title: 'Code Node',
@@ -79,7 +79,7 @@ const renderComponent = (
)
}
-describe('NodeActionsDropdown', () => {
+describe('NodeActionsMenu', () => {
beforeEach(() => {
vi.clearAllMocks()
mockUseNodeMetaData.mockReturnValue({
diff --git a/web/app/components/workflow/node-actions-menu/context-menu-content.tsx b/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
index dddd88b6c96..077cbe52449 100644
--- a/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
+++ b/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
@@ -47,7 +47,6 @@ export function NodeActionsContextMenuContent(props: NodeActionsMenuProps) {
<ContextMenuContent
finalFocus={() => (deletingRef.current ? (flowStore.getState().domNode ?? true) : true)}
className={NODE_ACTIONS_MENU_WIDTH_CLASS_NAME}
- sideOffset={4}
onKeyDown={(event) =>
handleWorkflowMenuKeyDown(event, [
['workflow.copy', hasEditGroup ? model.handleCopy : undefined],
diff --git a/web/app/components/workflow/node-actions-menu/index.tsx b/web/app/components/workflow/node-actions-menu/index.tsx
index 0da812bea3f..acfdeb03533 100644
--- a/web/app/components/workflow/node-actions-menu/index.tsx
+++ b/web/app/components/workflow/node-actions-menu/index.tsx
@@ -1,18 +1,18 @@
-import type { NodeActionsMenuProps } from './types'
+import type { NodeActionsMenuProps as NodeActionsContentProps } from './types'
import type { Node } from '@/app/components/workflow/types'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuGroup,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuGroup,
+ MenuItem,
+ MenuLinkItem,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import {
Popover,
PopoverBackdrop,
@@ -33,7 +33,7 @@ import {
} from './shared'
import { useNodeActionsMenuModel } from './use-node-actions-menu-model'
-type NodeActionsDropdownProps = {
+type NodeActionsMenuProps = {
id: string
data: Node['data']
triggerClassName?: string
@@ -41,13 +41,13 @@ type NodeActionsDropdownProps = {
showHelpLink?: boolean
}
-export function NodeActionsDropdown({
+export function NodeActionsMenu({
id,
data,
triggerClassName,
onOpenChange,
showHelpLink = true,
-}: NodeActionsDropdownProps) {
+}: NodeActionsMenuProps) {
const { t } = useTranslation(['common'])
const [open, setOpen] = useState(false)
@@ -65,8 +65,8 @@ export function NodeActionsDropdown({
}, [onOpenChange])
return (
- <DropdownMenu modal={false} open={open} onOpenChange={handleOpenChange}>
- <DropdownMenuTrigger
+ <Menu modal={false} open={open} onOpenChange={handleOpenChange}>
+ <MenuTrigger
render={
<IconButton
size="md"
@@ -77,19 +77,19 @@ export function NodeActionsDropdown({
</IconButton>
}
/>
- <DropdownMenuPortal>
- <NodeActionsDropdownContent
+ <MenuPortal>
+ <NodeActionsMenuContent
id={id}
data={data}
onClose={closeMenu}
showHelpLink={showHelpLink}
/>
- </DropdownMenuPortal>
- </DropdownMenu>
+ </MenuPortal>
+ </Menu>
)
}
-function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
+function NodeActionsMenuContent(props: NodeActionsContentProps) {
const { t } = useTranslation(['common', 'workflow', 'workflowDebug'])
const model = useNodeActionsMenuModel(props)
const flowStore = useStoreApi()
@@ -107,8 +107,8 @@ function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
}
return (
- <DropdownMenuPositioner align="end">
- <DropdownMenuPopup
+ <MenuPositioner sideOffset={4} align="end">
+ <MenuPopup
finalFocus={() => (deletingRef.current ? (flowStore.getState().domNode ?? true) : true)}
className={`${NODE_ACTIONS_MENU_WIDTH_CLASS_NAME} border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 shadow-lg backdrop-blur-[5px]`}
onKeyDown={(event) =>
@@ -120,13 +120,11 @@ function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
}
>
{hasRunGroup && (
- <DropdownMenuGroup>
- {model.canRun && (
- <DropdownMenuItem onClick={model.handleRun}>{singleRunActionLabel}</DropdownMenuItem>
- )}
+ <MenuGroup>
+ {model.canRun && <MenuItem onClick={model.handleRun}>{singleRunActionLabel}</MenuItem>}
{model.canChangeBlock && (
<Popover modal="trap-focus">
- <DropdownMenuItem
+ <MenuItem
closeOnClick={false}
// The menu row owns the focus treatment, so the trigger adds no ring.
render={
@@ -139,7 +137,7 @@ function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
className="data-popup-open:bg-state-base-hover"
>
{t(($) => $['panel.changeBlock'], { ns: 'workflow' })}
- </DropdownMenuItem>
+ </MenuItem>
<PopoverPortal>
<PopoverBackdrop />
<PopoverPositioner side="right" align="start" positionMethod="fixed">
@@ -153,38 +151,38 @@ function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
</PopoverPortal>
</Popover>
)}
- </DropdownMenuGroup>
+ </MenuGroup>
)}
{hasRunGroup &&
(hasEditGroup || hasDeleteGroup || model.workflowAppHref || model.helpLinkUri) && (
- <DropdownMenuSeparator />
+ <MenuSeparator />
)}
{hasEditGroup && (
- <DropdownMenuGroup>
- <DropdownMenuItem
+ <MenuGroup>
+ <MenuItem
className={NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME}
onClick={model.handleCopy}
>
<NodeActionsMenuItemContent shortcut="workflow.copy">
{t(($) => $['common.copy'], { ns: 'workflow' })}
</NodeActionsMenuItemContent>
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
className={NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME}
onClick={model.handleDuplicate}
>
<NodeActionsMenuItemContent shortcut="workflow.duplicate">
{t(($) => $['common.duplicate'], { ns: 'workflow' })}
</NodeActionsMenuItemContent>
- </DropdownMenuItem>
- </DropdownMenuGroup>
+ </MenuItem>
+ </MenuGroup>
)}
{hasEditGroup && (hasDeleteGroup || model.workflowAppHref || model.helpLinkUri) && (
- <DropdownMenuSeparator />
+ <MenuSeparator />
)}
{hasDeleteGroup && (
- <DropdownMenuGroup>
- <DropdownMenuItem
+ <MenuGroup>
+ <MenuItem
variant="destructive"
className={NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME}
onClick={handleDelete}
@@ -192,42 +190,32 @@ function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
<NodeActionsMenuItemContent shortcut="workflow.delete">
{t(($) => $['operation.delete'], { ns: 'common' })}
</NodeActionsMenuItemContent>
- </DropdownMenuItem>
- </DropdownMenuGroup>
- )}
- {hasDeleteGroup && (model.workflowAppHref || model.helpLinkUri) && (
- <DropdownMenuSeparator />
+ </MenuItem>
+ </MenuGroup>
)}
+ {hasDeleteGroup && (model.workflowAppHref || model.helpLinkUri) && <MenuSeparator />}
{model.workflowAppHref && (
- <DropdownMenuGroup>
- <DropdownMenuLinkItem
- href={model.workflowAppHref}
- target="_blank"
- rel="noopener noreferrer"
- >
+ <MenuGroup>
+ <MenuLinkItem href={model.workflowAppHref} target="_blank" rel="noopener noreferrer">
{t(($) => $['panel.openWorkflow'], { ns: 'workflow' })}
- </DropdownMenuLinkItem>
- </DropdownMenuGroup>
+ </MenuLinkItem>
+ </MenuGroup>
)}
- {model.workflowAppHref && model.helpLinkUri && <DropdownMenuSeparator />}
+ {model.workflowAppHref && model.helpLinkUri && <MenuSeparator />}
{model.helpLinkUri && (
- <DropdownMenuGroup>
- <DropdownMenuLinkItem
- href={model.helpLinkUri}
- target="_blank"
- rel="noopener noreferrer"
- >
+ <MenuGroup>
+ <MenuLinkItem href={model.helpLinkUri} target="_blank" rel="noopener noreferrer">
{t(($) => $['panel.helpLink'], { ns: 'workflow' })}
- </DropdownMenuLinkItem>
- </DropdownMenuGroup>
+ </MenuLinkItem>
+ </MenuGroup>
)}
- <DropdownMenuSeparator />
+ <MenuSeparator />
<NodeActionsMenuAbout
title={t(($) => $['panel.about'], { ns: 'workflow' })}
description={model.about.description}
author={`${t(($) => $['panel.createdBy'], { ns: 'workflow' })} ${model.about.author}`}
/>
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
+ </MenuPopup>
+ </MenuPositioner>
)
}
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx
index e2c67a99058..4d66c6833f1 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx
@@ -1,12 +1,12 @@
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { RiArrowDownSLine } from '@remixicon/react'
import { useTranslation } from 'react-i18next'
import { ErrorHandleTypeEnum } from './types'
@@ -45,8 +45,8 @@ const ErrorHandleTypeSelector = ({
const selectedOption = options.find((option) => option.value === value)
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<Button
size="small"
@@ -58,11 +58,11 @@ const ErrorHandleTypeSelector = ({
>
{selectedOption?.label}
<RiArrowDownSLine className="size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-70 p-1">
- <DropdownMenuRadioGroup value={value} onValueChange={onSelected}>
+ </MenuTrigger>
+ <MenuContent className="w-70">
+ <MenuRadioGroup value={value} onValueChange={onSelected}>
{availableOptions.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option.value}
value={option.value}
closeOnClick
@@ -72,17 +72,17 @@ const ErrorHandleTypeSelector = ({
}}
>
<div className="mr-1 w-4 shrink-0">
- <DropdownMenuRadioItemIndicator />
+ <MenuRadioItemIndicator />
</div>
<div className="grow">
<div className="mb-0.5 system-sm-semibold text-text-secondary">{option.label}</div>
<div className="system-xs-regular text-text-tertiary">{option.description}</div>
</div>
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx b/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
index 9fc8dd1a7b9..1a3de1cc574 100644
--- a/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
+++ b/web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
@@ -1,14 +1,14 @@
import type { CommonNodeType, OnSelectBlock } from '@/app/components/workflow/types'
import { buttonVariants } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuItem,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuItem,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { intersection } from 'es-toolkit/array'
import { useCallback } from 'react'
import { useTranslation } from 'react-i18next'
@@ -40,7 +40,7 @@ const ChangeItem = ({ data, nodeId, sourceHandle }: ChangeItemProps) => {
)
const triggerElement = (
- <DropdownMenuItem
+ <MenuItem
nativeButton
render={<button type="button" />}
closeOnClick={false}
@@ -48,11 +48,11 @@ const ChangeItem = ({ data, nodeId, sourceHandle }: ChangeItemProps) => {
variant: 'ghost',
size: 'medium',
className:
- 'mx-0 w-full justify-start px-2 data-highlighted:bg-components-button-ghost-bg-hover',
+ 'w-[calc(100%-8px)] justify-start px-2 data-highlighted:bg-components-button-ghost-bg-hover',
})}
>
{t(($) => $['panel.change'], { ns: 'workflow' })}
- </DropdownMenuItem>
+ </MenuItem>
)
return (
@@ -83,8 +83,8 @@ const Operator = ({ open, onOpenChange, data, nodeId, sourceHandle }: OperatorPr
const { handleNodeDelete, handleNodeDisconnect } = useNodesInteractions()
return (
- <DropdownMenu open={open} onOpenChange={onOpenChange}>
- <DropdownMenuTrigger
+ <Menu open={open} onOpenChange={onOpenChange}>
+ <MenuTrigger
render={
<IconButton
variant="secondary"
@@ -96,38 +96,36 @@ const Operator = ({ open, onOpenChange, data, nodeId, sourceHandle }: OperatorPr
</IconButton>
}
/>
- <DropdownMenuPortal>
- <DropdownMenuPositioner align="end" alignOffset={-4}>
- <DropdownMenuPopup>
+ <MenuPortal>
+ <MenuPositioner sideOffset={4} align="end" alignOffset={-4}>
+ <MenuPopup>
<div className="min-w-30 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur system-md-regular text-text-secondary shadow-lg">
- <div className="p-1">
+ <div className="py-1">
<ChangeItem data={data} nodeId={nodeId} sourceHandle={sourceHandle} />
- <DropdownMenuItem
- className="mx-0"
+ <MenuItem
onClick={() => {
onOpenChange(false)
handleNodeDisconnect(nodeId)
}}
>
{t(($) => $['common.disconnect'], { ns: 'workflow' })}
- </DropdownMenuItem>
+ </MenuItem>
</div>
- <div className="p-1">
- <DropdownMenuItem
- className="mx-0"
+ <div className="py-1">
+ <MenuItem
onClick={() => {
onOpenChange(false)
handleNodeDelete(nodeId)
}}
>
{t(($) => $['operation.delete'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
</div>
</div>
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- </DropdownMenu>
+ </MenuPopup>
+ </MenuPositioner>
+ </MenuPortal>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/_base/components/node-control.tsx b/web/app/components/workflow/nodes/_base/components/node-control.tsx
index 095c4ec3b72..c2b5eb96285 100644
--- a/web/app/components/workflow/nodes/_base/components/node-control.tsx
+++ b/web/app/components/workflow/nodes/_base/components/node-control.tsx
@@ -5,7 +5,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/too
import { memo } from 'react'
import { useTranslation } from 'react-i18next'
import { useHooksStore } from '@/app/components/workflow/hooks-store'
-import { NodeActionsDropdown } from '@/app/components/workflow/node-actions-menu'
+import { NodeActionsMenu } from '@/app/components/workflow/node-actions-menu'
import { useWorkflowStore } from '@/app/components/workflow/store'
import { useNodesInteractions } from '../../../hooks/use-nodes-interactions'
import { useNodesReadOnly } from '../../../hooks/use-workflow'
@@ -73,7 +73,7 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>
)}
</button>
)}
- <NodeActionsDropdown id={id} data={data} />
+ <NodeActionsMenu id={id} data={data} />
</div>
</div>
)
diff --git a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
index 7b10a68c4e3..a2841b8a5de 100644
--- a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
+++ b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
@@ -16,13 +16,13 @@ import {
DialogTitle,
} from '@langgenius/dify-ui/dialog'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
import { skipToken, useQuery } from '@tanstack/react-query'
import { useId, useRef, useState } from 'react'
@@ -112,7 +112,7 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
)}
</DialogContent>
</Dialog>
- <DropdownMenu
+ <Menu
open={requestedOpen && !!pluginDetail && canUpdatePlugin && !loadingVersions}
onOpenChange={setRequestedOpen}
>
@@ -120,7 +120,7 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
<Tooltip disabled={!tooltip || requestedOpen}>
<TooltipTrigger
render={
- <DropdownMenuTrigger
+ <MenuTrigger
ref={triggerRef}
render={
<Button
@@ -145,18 +145,18 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
<TooltipContent>{tooltip}</TooltipContent>
</Tooltip>
)}
- <DropdownMenuContent
+ <MenuContent
className="max-h-[min(16rem,var(--available-height))]"
align="start"
aria-labelledby={versionMenuLabelId}
>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel id={versionMenuLabelId}>
+ <MenuGroup>
+ <MenuGroupLabel id={versionMenuLabelId}>
{t(($) => $['detailPanel.switchVersion'], { ns: 'plugin' })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{versionsQuery.data && pluginDetail ? (
versionsQuery.data.data.versions.map((item) => (
- <DropdownMenuItem
+ <MenuItem
key={item.unique_identifier}
disabled={pluginDetail.version === item.version}
onClick={() => {
@@ -171,16 +171,16 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
<span className="ms-auto text-text-tertiary">
{formatDate(item.created_at, dateFormat)}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))
) : (
- <DropdownMenuItem closeOnClick={false} onClick={() => void versionsQuery.refetch()}>
+ <MenuItem closeOnClick={false} onClick={() => void versionsQuery.refetch()}>
{t(($) => $['operation.retry'], { ns: 'common' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
</div>
)
}
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
index 739e4e2d15b..0f765a009c1 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx
@@ -38,7 +38,7 @@ import {
editorResourceAtom,
} from '@/app/components/workflow/editor-resource/state'
import { useHooksStore } from '@/app/components/workflow/hooks-store'
-import { NodeActionsDropdown } from '@/app/components/workflow/node-actions-menu'
+import { NodeActionsMenu } from '@/app/components/workflow/node-actions-menu'
import Split from '@/app/components/workflow/nodes/_base/components/split'
import { useSetWorkflowNodePanelWidth } from '@/app/components/workflow/persistence/local-storage-options'
import { useLogs } from '@/app/components/workflow/run/hooks'
@@ -685,7 +685,7 @@ const BasePanel: FC<BasePanelProps> = ({ id, data, children }) => {
</Tooltip>
)}
<HelpLink nodeType={nodeMetaType} />
- <NodeActionsDropdown id={id} data={data} showHelpLink={false} />
+ <NodeActionsMenu id={id} data={data} showHelpLink={false} />
<div className="mx-3 h-3.5 w-px bg-divider-regular" />
<IconButton
aria-label={t(($) => $['operation.close'], { ns: 'common' })}
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
index bed2a51f9f8..2df266161dc 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
@@ -11,12 +11,7 @@ import type {
} from '@dify/contracts/api/console/apps/types.gen'
import type { EditorResource } from '@/app/components/workflow/editor-resource/resource'
import type { AgentPreviewChatController } from '@/features/agent-v2/agent-detail/configure/components/preview/chat-conversation'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { skipToken, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useAtom, useAtomValue, useStore as useJotaiStore, useSetAtom } from 'jotai'
import { ScopeProvider } from 'jotai-scope'
@@ -734,8 +729,8 @@ function WorkflowInlineAgentConfigureMoreAction({
if (!canCreateAgents) return null
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<button
type="button"
@@ -746,16 +741,16 @@ function WorkflowInlineAgentConfigureMoreAction({
</button>
}
/>
- <DropdownMenuContent className="w-max min-w-44">
- <DropdownMenuItem className="gap-2 whitespace-nowrap" onClick={onSaveInlineToRoster}>
+ <MenuContent align="end" className="w-max min-w-44">
+ <MenuItem className="gap-2 whitespace-nowrap" onClick={onSaveInlineToRoster}>
<span
aria-hidden
className="i-ri-inbox-archive-line size-4 shrink-0 text-text-tertiary"
/>
<span>{t(($) => $['roster.saveToRoster'], { ns: 'agentRoster' })}</span>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
index b46a12de764..c7ea1cd47ec 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
@@ -19,13 +19,8 @@ import {
DrawerTitle,
DrawerViewport,
} from '@langgenius/dify-ui/drawer'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Suspense, useId, useState } from 'react'
import { useTranslation } from 'react-i18next'
import AppIcon from '@/app/components/base/app-icon'
@@ -205,17 +200,17 @@ function AgentRosterDrawer({
<div className="flex shrink-0 items-center gap-1 py-1">
{showInlineActions && (
<>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={t(($) => $[`${i18nPrefix}.roster.more`], {
ns: 'workflowAgent',
})}
className="flex size-6 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover data-popup-open:bg-state-base-hover"
>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-max min-w-44">
- <DropdownMenuItem
+ </MenuTrigger>
+ <MenuContent align="end" className="w-max min-w-44">
+ <MenuItem
className="gap-2 whitespace-nowrap"
onClick={onSaveInlineToRoster}
>
@@ -226,9 +221,9 @@ function AgentRosterDrawer({
<span>
{t(($) => $['roster.saveToRoster'], { ns: 'agentRoster' })}
</span>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
<div className="flex h-3.5 items-start px-1">
<div className="h-full w-px bg-divider-regular" />
</div>
diff --git a/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx b/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
index fcab72c9b5c..a91e6040bbb 100644
--- a/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
+++ b/web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
@@ -3,16 +3,16 @@ import type { Item } from '../utils'
import type { VarType } from '@/app/components/workflow/types'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import { getOperationItems, isOperationItem } from '../utils'
@@ -52,8 +52,8 @@ function OperationSelector({
const selectedItem = items.find((item) => item.value === value)
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
disabled={disabled}
className={cn(
'group flex items-center gap-0.5 rounded-lg bg-components-input-bg-normal px-2 py-1 data-popup-open:bg-state-base-hover-alt',
@@ -79,14 +79,14 @@ function OperationSelector({
disabled && 'text-components-input-text-placeholder',
)}
/>
- </DropdownMenuTrigger>
+ </MenuTrigger>
- <DropdownMenuContent align="start" className={cn('w-35', popupClassName)}>
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>
+ <MenuContent align="start" className={cn('w-35', popupClassName)}>
+ <MenuGroup>
+ <MenuGroupLabel>
{t(($) => $['nodes.assigner.operations.title'], { ns: 'workflowLogic' })}
- </DropdownMenuGroupLabel>
- <DropdownMenuRadioGroup
+ </MenuGroupLabel>
+ <MenuRadioGroup
value={value}
onValueChange={(nextValue) => {
const item = items.find((item) => isOperationItem(item) && item.value === nextValue)
@@ -95,14 +95,9 @@ function OperationSelector({
>
{items.map((item) =>
!isOperationItem(item) ? (
- <DropdownMenuSeparator key="divider" />
+ <MenuSeparator key="divider" />
) : (
- <DropdownMenuRadioItem
- key={item.value}
- className="py-1"
- value={item.value}
- closeOnClick
- >
+ <MenuRadioItem key={item.value} className="py-1" value={item.value} closeOnClick>
<div className="flex min-h-5 grow items-center gap-1 px-1">
<span className="flex grow system-sm-medium text-text-secondary">
{t(($) => $[`nodes.assigner.operations.${item.name}`], {
@@ -110,14 +105,14 @@ function OperationSelector({
})}
</span>
</div>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
),
)}
- </DropdownMenuRadioGroup>
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx
index a78713ef4d0..9809de9a70c 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx
@@ -3,12 +3,12 @@ import type { VarType } from '@/app/components/workflow/types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { RiArrowDownSLine } from '@remixicon/react'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -48,8 +48,8 @@ const ConditionOperator = ({
Array.isArray(value) ? o.value === value[0] : o.value === value,
)
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<Button
className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
@@ -63,22 +63,22 @@ const ConditionOperator = ({
? selectedOption.label
: t(($) => $[`${i18nPrefix}.select`], { ns: 'workflowLogic' })}
<RiArrowDownSLine className="size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1">
- <DropdownMenuRadioGroup value={selectedOption?.value} onValueChange={onSelect}>
+ </MenuTrigger>
+ <MenuContent className="rounded-xl border-[0.5px] bg-components-panel-bg-blur">
+ <MenuRadioGroup value={selectedOption?.value} onValueChange={onSelect}>
{options.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option.value}
value={option.value}
closeOnClick
className="h-7 rounded-lg px-3 py-1.5 text-[13px] font-medium text-text-secondary"
>
{option.label}
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx b/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx
index 6cdde2f37e3..4e3a2458366 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx
@@ -2,12 +2,12 @@ import type { NodeOutPutVar, ValueSelector } from '@/app/components/workflow/typ
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { RiArrowDownSLine } from '@remixicon/react'
import { useBoolean } from 'ahooks'
@@ -55,19 +55,19 @@ const ConditionNumberInput = ({
return (
<div className="flex cursor-pointer items-center">
- <DropdownMenu>
- <DropdownMenuTrigger render={<Button className="shrink-0" variant="ghost" size="small" />}>
+ <Menu>
+ <MenuTrigger render={<Button className="shrink-0" variant="ghost" size="small" />}>
{capitalize(numberVarType)}
<RiArrowDownSLine className="size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent
+ </MenuTrigger>
+ <MenuContent
align="start"
sideOffset={2}
- className="w-28 rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+ className="w-28 rounded-xl border-[0.5px] bg-components-panel-bg-blur"
>
- <DropdownMenuRadioGroup value={numberVarType} onValueChange={onNumberVarTypeChange}>
+ <MenuRadioGroup value={numberVarType} onValueChange={onNumberVarTypeChange}>
{options.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option}
value={option}
closeOnClick
@@ -78,11 +78,11 @@ const ConditionNumberInput = ({
)}
>
{capitalize(option)}
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
<div className="mx-1 h-4 w-px bg-divider-regular"></div>
<div className="ml-0.5 w-0 grow">
{numberVarType === VarKindType.variable && (
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
index c921ff93263..cbb9000ec5c 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
@@ -1,16 +1,16 @@
import type { MetadataShape } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuEmpty,
- DropdownMenuFilterProvider,
- DropdownMenuInput,
- DropdownMenuInputGroup,
- DropdownMenuItem,
- DropdownMenuList,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuEmpty,
+ MenuFilterProvider,
+ MenuInput,
+ MenuInputGroup,
+ MenuItem,
+ MenuList,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import MetadataIcon from './metadata-icon'
@@ -24,24 +24,24 @@ const AddCondition = ({
})
return (
- <DropdownMenuFilterProvider>
- <DropdownMenu>
- <DropdownMenuTrigger render={<Button size="small" variant="secondary" />}>
+ <MenuFilterProvider>
+ <Menu>
+ <MenuTrigger render={<Button size="small" variant="secondary" />}>
<span aria-hidden="true" className="i-ri-add-line size-3.5" />
{t(($) => $['nodes.knowledgeRetrieval.metadata.panel.add'], { ns: 'workflowModels' })}
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" sideOffset={12} className="w-80">
- <DropdownMenuInputGroup>
+ </MenuTrigger>
+ <MenuContent align="start" sideOffset={12} className="w-80">
+ <MenuInputGroup>
<span
aria-hidden="true"
className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
/>
- <DropdownMenuInput aria-label={searchLabel} placeholder={searchLabel} />
- </DropdownMenuInputGroup>
- <DropdownMenuEmpty>{t(($) => $.noData, { ns: 'common' })}</DropdownMenuEmpty>
- <DropdownMenuList>
+ <MenuInput aria-label={searchLabel} placeholder={searchLabel} />
+ </MenuInputGroup>
+ <MenuEmpty>{t(($) => $.noData, { ns: 'common' })}</MenuEmpty>
+ <MenuList>
{metadataList?.map((metadata) => (
- <DropdownMenuItem
+ <MenuItem
key={metadata.name}
label={metadata.name}
onClick={() => handleAddCondition?.(metadata)}
@@ -53,12 +53,12 @@ const AddCondition = ({
<span className="shrink-0 system-xs-regular text-text-tertiary">
{metadata.type}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuList>
- </DropdownMenuContent>
- </DropdownMenu>
- </DropdownMenuFilterProvider>
+ </MenuList>
+ </MenuContent>
+ </Menu>
+ </MenuFilterProvider>
)
}
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx
index b8f72a7bd27..662063693fc 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx
@@ -1,12 +1,12 @@
import { Button } from '@langgenius/dify-ui/button'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import { MetadataFilteringModeEnum } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
@@ -58,34 +58,34 @@ const MetadataFilterSelector = ({
visibleOptions.find((option) => option.key === value) ?? visibleOptions[0] ?? options[0]!
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={<Button variant="secondary" size="small" onClick={(e) => e.stopPropagation()} />}
>
{selectedOption.value}
<span aria-hidden className="i-ri-arrow-down-s-line size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-70 p-1">
- <DropdownMenuRadioGroup value={value} onValueChange={onSelect}>
+ </MenuTrigger>
+ <MenuContent className="w-70">
+ <MenuRadioGroup value={value} onValueChange={onSelect}>
{visibleOptions.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option.key}
value={option.key}
closeOnClick
className="h-auto items-start p-2 pr-3"
>
<div className="w-4 shrink-0">
- <DropdownMenuRadioItemIndicator />
+ <MenuRadioItemIndicator />
</div>
<div className="grow">
<div className="system-sm-semibold text-text-secondary">{option.value}</div>
<div className="system-xs-regular text-text-tertiary">{option.desc}</div>
</div>
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx b/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx
index a78713ef4d0..9809de9a70c 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx
@@ -3,12 +3,12 @@ import type { VarType } from '@/app/components/workflow/types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { RiArrowDownSLine } from '@remixicon/react'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
@@ -48,8 +48,8 @@ const ConditionOperator = ({
Array.isArray(value) ? o.value === value[0] : o.value === value,
)
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<Button
className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
@@ -63,22 +63,22 @@ const ConditionOperator = ({
? selectedOption.label
: t(($) => $[`${i18nPrefix}.select`], { ns: 'workflowLogic' })}
<RiArrowDownSLine className="size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1">
- <DropdownMenuRadioGroup value={selectedOption?.value} onValueChange={onSelect}>
+ </MenuTrigger>
+ <MenuContent className="rounded-xl border-[0.5px] bg-components-panel-bg-blur">
+ <MenuRadioGroup value={selectedOption?.value} onValueChange={onSelect}>
{options.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option.value}
value={option.value}
closeOnClick
className="h-7 rounded-lg px-3 py-1.5 text-[13px] font-medium text-text-secondary"
>
{option.label}
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx b/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx
index 6cdde2f37e3..4e3a2458366 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx
@@ -2,12 +2,12 @@ import type { NodeOutPutVar, ValueSelector } from '@/app/components/workflow/typ
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { RiArrowDownSLine } from '@remixicon/react'
import { useBoolean } from 'ahooks'
@@ -55,19 +55,19 @@ const ConditionNumberInput = ({
return (
<div className="flex cursor-pointer items-center">
- <DropdownMenu>
- <DropdownMenuTrigger render={<Button className="shrink-0" variant="ghost" size="small" />}>
+ <Menu>
+ <MenuTrigger render={<Button className="shrink-0" variant="ghost" size="small" />}>
{capitalize(numberVarType)}
<RiArrowDownSLine className="size-3.5" />
- </DropdownMenuTrigger>
- <DropdownMenuContent
+ </MenuTrigger>
+ <MenuContent
align="start"
sideOffset={2}
- className="w-28 rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+ className="w-28 rounded-xl border-[0.5px] bg-components-panel-bg-blur"
>
- <DropdownMenuRadioGroup value={numberVarType} onValueChange={onNumberVarTypeChange}>
+ <MenuRadioGroup value={numberVarType} onValueChange={onNumberVarTypeChange}>
{options.map((option) => (
- <DropdownMenuRadioItem
+ <MenuRadioItem
key={option}
value={option}
closeOnClick
@@ -78,11 +78,11 @@ const ConditionNumberInput = ({
)}
>
{capitalize(option)}
- </DropdownMenuRadioItem>
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
<div className="mx-1 h-4 w-px bg-divider-regular"></div>
<div className="ml-0.5 w-0 grow">
{numberVarType === VarKindType.variable && (
diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/operator.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/operator.tsx
index c6c97a7997f..d14e4539ef0 100644
--- a/web/app/components/workflow/note-node/note-editor/toolbar/operator.tsx
+++ b/web/app/components/workflow/note-node/note-editor/toolbar/operator.tsx
@@ -1,15 +1,15 @@
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuCheckboxItem,
- DropdownMenuCheckboxItemIndicator,
- DropdownMenuItem,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuCheckboxItem,
+ MenuCheckboxItemIndicator,
+ MenuItem,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { memo, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useStoreApi } from 'reactflow'
@@ -57,8 +57,8 @@ const Operator = ({
}
return (
- <DropdownMenu open={open} onOpenChange={handleOpenChange}>
- <DropdownMenuTrigger
+ <Menu open={open} onOpenChange={handleOpenChange}>
+ <MenuTrigger
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
className={cn(
'flex size-8 cursor-pointer items-center justify-center rounded-lg text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',
@@ -73,10 +73,10 @@ const Operator = ({
onClick={(event) => event.stopPropagation()}
>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuPositioner align="end">
- <DropdownMenuPopup
+ </MenuTrigger>
+ <MenuPortal>
+ <MenuPositioner sideOffset={4} align="end">
+ <MenuPopup
finalFocus={() => (deletingRef.current ? (flowStore.getState().domNode ?? true) : true)}
onKeyDown={(event) =>
handleWorkflowMenuKeyDown(event, [
@@ -88,49 +88,49 @@ const Operator = ({
>
<div className="min-w-48 rounded-md border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-xl">
<div className="p-1">
- <DropdownMenuItem
+ <MenuItem
className="justify-between rounded-md px-3 text-sm text-text-secondary"
onClick={handleCopy}
>
{t(($) => $['common.copy'], { ns: 'workflow' })}
<ShortcutKbd shortcut="workflow.copy" />
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
className="justify-between rounded-md px-3 text-sm text-text-secondary"
onClick={handleDuplicate}
>
{t(($) => $['common.duplicate'], { ns: 'workflow' })}
<ShortcutKbd shortcut="workflow.duplicate" />
- </DropdownMenuItem>
+ </MenuItem>
</div>
- <DropdownMenuSeparator className="my-0" />
+ <MenuSeparator className="my-0" />
<div className="p-1">
- <DropdownMenuCheckboxItem
+ <MenuCheckboxItem
checked={showAuthor}
onCheckedChange={onShowAuthorChange}
closeOnClick={false}
className="justify-between rounded-md px-3 text-sm text-text-secondary"
>
{t(($) => $['nodes.note.editor.showAuthor'], { ns: 'workflow' })}
- <DropdownMenuCheckboxItemIndicator />
- </DropdownMenuCheckboxItem>
+ <MenuCheckboxItemIndicator />
+ </MenuCheckboxItem>
</div>
- <DropdownMenuSeparator className="my-0" />
+ <MenuSeparator className="my-0" />
<div className="p-1">
- <DropdownMenuItem
+ <MenuItem
variant="destructive"
className="justify-between rounded-md px-3 text-sm text-text-secondary"
onClick={handleDelete}
>
{t(($) => $['operation.delete'], { ns: 'common' })}
<ShortcutKbd shortcut="workflow.delete" />
- </DropdownMenuItem>
+ </MenuItem>
</div>
</div>
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- </DropdownMenu>
+ </MenuPopup>
+ </MenuPositioner>
+ </MenuPortal>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/operator/export-image.tsx b/web/app/components/workflow/operator/export-image.tsx
index 7960780487b..ac22cb5b69c 100644
--- a/web/app/components/workflow/operator/export-image.tsx
+++ b/web/app/components/workflow/operator/export-image.tsx
@@ -1,13 +1,13 @@
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { skipToken, useQuery } from '@tanstack/react-query'
import { toJpeg, toPng, toSvg } from 'html-to-image'
import { useAtomValue } from 'jotai'
@@ -154,10 +154,10 @@ const ExportImage = memo(() => {
return (
<>
- <DropdownMenu disabled={isReadOnly}>
+ <Menu disabled={isReadOnly}>
<TipPopup title={t(($) => $['common.exportImage'], { ns: 'workflow' })}>
{/* Tooltip also sets data-popup-open; Menu alone sets data-pressed for its open state. */}
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<IconButton
size="lg"
@@ -170,57 +170,37 @@ const ExportImage = memo(() => {
}
/>
</TipPopup>
- <DropdownMenuContent side="right" className="min-w-45">
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>
- {t(($) => $['common.currentView'], { ns: 'workflow' })}
- </DropdownMenuGroupLabel>
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleExportImage('png')}
- >
+ <MenuContent side="right" className="min-w-45">
+ <MenuGroup>
+ <MenuGroupLabel>{t(($) => $['common.currentView'], { ns: 'workflow' })}</MenuGroupLabel>
+ <MenuItem className="system-md-regular" onClick={() => handleExportImage('png')}>
{t(($) => $['common.exportPNG'], { ns: 'workflow' })}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleExportImage('jpeg')}
- >
+ </MenuItem>
+ <MenuItem className="system-md-regular" onClick={() => handleExportImage('jpeg')}>
{t(($) => $['common.exportJPEG'], { ns: 'workflow' })}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleExportImage('svg')}
- >
+ </MenuItem>
+ <MenuItem className="system-md-regular" onClick={() => handleExportImage('svg')}>
{t(($) => $['common.exportSVG'], { ns: 'workflow' })}
- </DropdownMenuItem>
- </DropdownMenuGroup>
- <DropdownMenuSeparator className="mx-2" />
+ </MenuItem>
+ </MenuGroup>
+ <MenuSeparator className="mx-2" />
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel>
+ <MenuGroup>
+ <MenuGroupLabel>
{t(($) => $['common.currentWorkflow'], { ns: 'workflow' })}
- </DropdownMenuGroupLabel>
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleExportImage('png', true)}
- >
+ </MenuGroupLabel>
+ <MenuItem className="system-md-regular" onClick={() => handleExportImage('png', true)}>
{t(($) => $['common.exportPNG'], { ns: 'workflow' })}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleExportImage('jpeg', true)}
- >
+ </MenuItem>
+ <MenuItem className="system-md-regular" onClick={() => handleExportImage('jpeg', true)}>
{t(($) => $['common.exportJPEG'], { ns: 'workflow' })}
- </DropdownMenuItem>
- <DropdownMenuItem
- className="system-md-regular"
- onClick={() => handleExportImage('svg', true)}
- >
+ </MenuItem>
+ <MenuItem className="system-md-regular" onClick={() => handleExportImage('svg', true)}>
{t(($) => $['common.exportSVG'], { ns: 'workflow' })}
- </DropdownMenuItem>
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
{previewUrl && (
<ImagePreview url={previewUrl} title={previewTitle} onCancel={() => setPreviewUrl('')} />
diff --git a/web/app/components/workflow/operator/zoom-in-out.tsx b/web/app/components/workflow/operator/zoom-in-out.tsx
index 1c85d36f3a9..7e83979db57 100644
--- a/web/app/components/workflow/operator/zoom-in-out.tsx
+++ b/web/app/components/workflow/operator/zoom-in-out.tsx
@@ -1,14 +1,14 @@
import type { FC } from 'react'
import {
- DropdownMenu,
- DropdownMenuCheckboxItem,
- DropdownMenuItem,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuCheckboxItem,
+ MenuItem,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useSuspenseQuery } from '@tanstack/react-query'
import { Fragment, memo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -184,16 +184,16 @@ const ZoomInOut: FC<ZoomInOutProps> = ({
/>
</button>
</TipPopup>
- <DropdownMenu open={open} onOpenChange={setOpen}>
- <DropdownMenuTrigger
+ <Menu open={open} onOpenChange={setOpen}>
+ <MenuTrigger
disabled={getWorkflowReadOnly()}
className="flex h-8 w-8.5 items-center justify-center rounded-lg system-sm-medium text-text-tertiary hover:bg-black/5 hover:text-text-secondary data-popup-open:bg-black/5 data-popup-open:text-text-secondary"
>
{Number.parseFloat(`${zoom * 100}`).toFixed(0)}%
- </DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuPositioner side="top" align="start" alignOffset={-2}>
- <DropdownMenuPopup
+ </MenuTrigger>
+ <MenuPortal>
+ <MenuPositioner sideOffset={4} side="top" align="start" alignOffset={-2}>
+ <MenuPopup
onKeyDown={(event) => {
if (workflowReadOnly) return
handleWorkflowMenuKeyDown(event, [
@@ -206,11 +206,11 @@ const ZoomInOut: FC<ZoomInOutProps> = ({
<div className="w-48 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]">
{zoomOptions.map((options, groupIndex) => (
<Fragment key={options[0]!.key}>
- {groupIndex !== 0 && <DropdownMenuSeparator className="my-0" />}
+ {groupIndex !== 0 && <MenuSeparator className="my-0" />}
<div className="p-1">
{options.map((option) =>
'checked' in option ? (
- <DropdownMenuCheckboxItem
+ <MenuCheckboxItem
key={option.key}
className="gap-2 px-3 py-1.5 system-md-regular text-text-secondary"
checked={option.checked}
@@ -227,9 +227,9 @@ const ZoomInOut: FC<ZoomInOutProps> = ({
}
/>
<span>{option.text}</span>
- </DropdownMenuCheckboxItem>
+ </MenuCheckboxItem>
) : (
- <DropdownMenuItem
+ <MenuItem
key={option.key}
className="justify-between px-3 py-1.5 system-md-regular text-text-secondary"
onClick={() => selectZoom(option.key)}
@@ -257,17 +257,17 @@ const ZoomInOut: FC<ZoomInOutProps> = ({
<ShortcutKbd shortcut="workflow.zoom-to-100" />
)}
</div>
- </DropdownMenuItem>
+ </MenuItem>
),
)}
</div>
</Fragment>
))}
</div>
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- </DropdownMenu>
+ </MenuPopup>
+ </MenuPositioner>
+ </MenuPortal>
+ </Menu>
<TipPopup
title={t(($) => $['operator.zoomIn'], { ns: 'workflow' })}
shortcut="workflow.zoom-in"
diff --git a/web/app/components/workflow/panel-contextmenu.tsx b/web/app/components/workflow/panel-contextmenu.tsx
index 6702e3695dd..ebe96dd4031 100644
--- a/web/app/components/workflow/panel-contextmenu.tsx
+++ b/web/app/components/workflow/panel-contextmenu.tsx
@@ -85,7 +85,6 @@ export function PanelContextmenu({ onClose }: { onClose: () => void }) {
return (
<ContextMenuContent
className="w-50 rounded-lg"
- sideOffset={4}
onKeyDown={(event) =>
handleWorkflowMenuKeyDown(event, [
['workflow.paste', canEditWorkflow && clipboardElements.length ? pasteNodes : undefined],
diff --git a/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx b/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx
index bf73240ba05..f4fd391507c 100644
--- a/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx
@@ -1,12 +1,6 @@
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useQuery } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import * as React from 'react'
@@ -112,7 +106,7 @@ type ActionMenuItemProps = {
function ActionMenuItem({ item, onClick, isDestructive = false }: ActionMenuItemProps) {
const { t } = useTranslation(['billing'])
return (
- <DropdownMenuItem
+ <MenuItem
disabled={item.disabled}
variant={isDestructive ? 'destructive' : 'default'}
className={cn(
@@ -169,7 +163,7 @@ function ActionMenuItem({ item, onClick, isDestructive = false }: ActionMenuItem
</span>
</PremiumBadge>
)}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -187,8 +181,8 @@ function ActionMenu(props: ActionMenuProps) {
}
return (
- <DropdownMenu open={open} onOpenChange={setOpen}>
- <DropdownMenuTrigger
+ <Menu open={open} onOpenChange={setOpen}>
+ <MenuTrigger
ref={triggerRef}
className="absolute top-1 right-1 z-10 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 focus:opacity-100 data-popup-open:opacity-100 [@media(hover:none)]:opacity-100"
render={
@@ -202,18 +196,21 @@ function ActionMenu(props: ActionMenuProps) {
</IconButton>
}
/>
- <DropdownMenuContent className="w-max max-w-[calc(100vw-24px)] min-w-46 shadow-shadow-shadow-5">
+ <MenuContent
+ align="end"
+ className="w-max max-w-[calc(100vw-24px)] min-w-46 shadow-shadow-shadow-5"
+ >
{options.map((option) => (
<ActionMenuItem key={option.key} item={option} onClick={handleAction} />
))}
{isShowDelete && (
<>
- <DropdownMenuSeparator />
+ <MenuSeparator />
<ActionMenuItem item={deleteOperation} isDestructive onClick={handleAction} />
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx b/web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx
index 49712f0e60f..979ce3a0dc4 100644
--- a/web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx
+++ b/web/app/components/workflow/run/agent-log/agent-log-nav-more.tsx
@@ -1,11 +1,6 @@
import type { AgentLogItemWithChildren } from '@/types/workflow'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
type AgentLogNavMoreProps = {
@@ -16,8 +11,8 @@ const AgentLogNavMore = ({ options, onShowAgentOrToolLog }: AgentLogNavMoreProps
const { t } = useTranslation(['common'])
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -29,18 +24,18 @@ const AgentLogNavMore = ({ options, onShowAgentOrToolLog }: AgentLogNavMoreProps
</IconButton>
}
/>
- <DropdownMenuContent align="start" sideOffset={2} alignOffset={-54} className="w-34 p-1">
+ <MenuContent align="start" sideOffset={2} alignOffset={-54} className="w-34">
{options.map((option) => (
- <DropdownMenuItem
+ <MenuItem
key={option.message_id}
className="system-md-regular"
onClick={() => onShowAgentOrToolLog(option)}
>
{option.label}
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/app/components/workflow/selection-contextmenu.tsx b/web/app/components/workflow/selection-contextmenu.tsx
index a80834a152a..03d723196a0 100644
--- a/web/app/components/workflow/selection-contextmenu.tsx
+++ b/web/app/components/workflow/selection-contextmenu.tsx
@@ -410,7 +410,6 @@ export function SelectionContextmenu({ onClose }: { onClose: () => void }) {
return returnToCanvas ? (flowStore.getState().domNode ?? true) : true
}}
className="w-60"
- sideOffset={4}
onKeyDown={(event) => {
if (getNodesReadOnly()) return
handleWorkflowMenuKeyDown(event, [
diff --git a/web/app/components/workflow/shortcuts/__tests__/workflow-canvas.browser.spec.tsx b/web/app/components/workflow/shortcuts/__tests__/workflow-canvas.browser.spec.tsx
index b67b1929c53..0d83e3e6d4e 100644
--- a/web/app/components/workflow/shortcuts/__tests__/workflow-canvas.browser.spec.tsx
+++ b/web/app/components/workflow/shortcuts/__tests__/workflow-canvas.browser.spec.tsx
@@ -16,7 +16,7 @@ import { useEdgesInteractions } from '../../hooks/use-edges-interactions'
import { useNodeKeyboardInteractions } from '../../hooks/use-node-keyboard-interactions'
import { useNodesInteractions } from '../../hooks/use-nodes-interactions'
import { useSelectionInteractions } from '../../hooks/use-selection-interactions'
-import { NodeActionsDropdown } from '../../node-actions-menu'
+import { NodeActionsMenu } from '../../node-actions-menu'
import { NodeActionsContextMenuContent } from '../../node-actions-menu/context-menu-content'
import VarReferenceVars from '../../nodes/_base/components/variable/var-reference-vars'
import { NoteEditor, NoteEditorContextProvider } from '../../note-node/note-editor'
@@ -39,7 +39,7 @@ function NodeWithMenu({ id, data }: NodeProps) {
return (
<div className="nodrag nopan">
Workflow node
- <NodeActionsDropdown id={id} data={data} showHelpLink={false} />
+ <NodeActionsMenu id={id} data={data} showHelpLink={false} />
</div>
)
}
diff --git a/web/app/components/workflow/workflow-preview/components/zoom-in-out.tsx b/web/app/components/workflow/workflow-preview/components/zoom-in-out.tsx
index 89559c59082..9ee3f60ec90 100644
--- a/web/app/components/workflow/workflow-preview/components/zoom-in-out.tsx
+++ b/web/app/components/workflow/workflow-preview/components/zoom-in-out.tsx
@@ -1,14 +1,14 @@
import type { FC } from 'react'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuItem,
- DropdownMenuPopup,
- DropdownMenuPortal,
- DropdownMenuPositioner,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuItem,
+ MenuPopup,
+ MenuPortal,
+ MenuPositioner,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { Fragment, memo } from 'react'
import { useTranslation } from 'react-i18next'
import { useReactFlow, useViewport } from 'reactflow'
@@ -107,20 +107,20 @@ const ZoomInOut: FC = () => {
/>
</button>
</TipPopup>
- <DropdownMenu>
- <DropdownMenuTrigger className="flex h-8 w-8.5 items-center justify-center rounded-lg system-sm-medium text-text-tertiary hover:bg-black/5 hover:text-text-secondary data-popup-open:bg-black/5 data-popup-open:text-text-secondary">
+ <Menu>
+ <MenuTrigger className="flex h-8 w-8.5 items-center justify-center rounded-lg system-sm-medium text-text-tertiary hover:bg-black/5 hover:text-text-secondary data-popup-open:bg-black/5 data-popup-open:text-text-secondary">
{Number.parseFloat(`${zoom * 100}`).toFixed(0)}%
- </DropdownMenuTrigger>
- <DropdownMenuPortal>
- <DropdownMenuPositioner side="top" align="start" alignOffset={-2}>
- <DropdownMenuPopup>
+ </MenuTrigger>
+ <MenuPortal>
+ <MenuPositioner sideOffset={4} side="top" align="start" alignOffset={-2}>
+ <MenuPopup>
<div className="w-36.25 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]">
{zoomOptions.map((options, groupIndex) => (
<Fragment key={options[0]!.key}>
- {groupIndex !== 0 && <DropdownMenuSeparator className="my-0" />}
+ {groupIndex !== 0 && <MenuSeparator className="my-0" />}
<div className="p-1">
{options.map((option) => (
- <DropdownMenuItem
+ <MenuItem
key={option.key}
className="justify-between px-3 py-1.5 system-md-regular text-text-secondary"
onClick={() => handleZoom(option.key)}
@@ -137,16 +137,16 @@ const ZoomInOut: FC = () => {
<ShortcutKbd shortcut="workflow.zoom-to-100" />
)}
</div>
- </DropdownMenuItem>
+ </MenuItem>
))}
</div>
</Fragment>
))}
</div>
- </DropdownMenuPopup>
- </DropdownMenuPositioner>
- </DropdownMenuPortal>
- </DropdownMenu>
+ </MenuPopup>
+ </MenuPositioner>
+ </MenuPortal>
+ </Menu>
<TipPopup
title={t(($) => $['operator.zoomIn'], { ns: 'workflow' })}
shortcut="workflow.zoom-in"
diff --git a/web/app/education/apply/applied-education-content.tsx b/web/app/education/apply/applied-education-content.tsx
index c5ee4b775d8..e45e5e3be8d 100644
--- a/web/app/education/apply/applied-education-content.tsx
+++ b/web/app/education/apply/applied-education-content.tsx
@@ -8,7 +8,7 @@ import type {
import type { ReactNode } from 'react'
import { Select, SelectTrigger } from '@langgenius/dify-ui/select'
import { useTranslation } from 'react-i18next'
-import { WorkplaceSelectorContent } from '@/app/components/header/account-dropdown/workplace-selector'
+import { WorkplaceSelectorContent } from '@/app/components/header/account-menu/workplace-selector'
import { PlanBadge } from '@/app/components/header/plan-badge'
type AppliedEducationContentProps = {
diff --git a/web/app/signin/_locale-menu.tsx b/web/app/signin/_locale-menu.tsx
index 1e2f91da6a8..aae7f4a9c83 100644
--- a/web/app/signin/_locale-menu.tsx
+++ b/web/app/signin/_locale-menu.tsx
@@ -1,11 +1,11 @@
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
type LocaleMenuItem<T extends string> = {
value: T
@@ -27,10 +27,10 @@ export default function LocaleMenu<T extends string>({
return (
<div className="w-56 text-right">
- <DropdownMenu>
+ <Menu>
<div className="relative inline-block text-left">
<div>
- <DropdownMenuTrigger
+ <MenuTrigger
render={
<button
type="button"
@@ -40,28 +40,25 @@ export default function LocaleMenu<T extends string>({
>
<span className="mr-1 i-heroicons-globe-alt size-5" aria-hidden="true" />
{selectedItem?.name}
- </DropdownMenuTrigger>
+ </MenuTrigger>
</div>
</div>
- <DropdownMenuContent sideOffset={8} className="w-50">
- <DropdownMenuRadioGroup<T>
- value={value}
- onValueChange={(nextValue) => onChange?.(nextValue)}
- >
+ <MenuContent sideOffset={8} className="w-50">
+ <MenuRadioGroup<T> value={value} onValueChange={(nextValue) => onChange?.(nextValue)}>
{items.map((item) => (
- <DropdownMenuRadioItem<T>
+ <MenuRadioItem<T>
key={item.value}
value={item.value}
closeOnClick
className="px-3 py-2 text-sm text-text-secondary"
>
<span className="grow truncate">{item.name}</span>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
</div>
)
}
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx
index cbae7c98729..6f60174fde3 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/index.tsx
@@ -9,13 +9,7 @@ import type { AgentOrchestrateAddActionOptions } from '../add-actions-context'
import type { AgentSkill } from '@/features/agent-v2/agent-composer/form-state'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import {
keepPreviousData,
@@ -396,13 +390,13 @@ function WorkspaceAgentSkillItem({
{skill.name}
</span>
</Link>
- <DropdownMenu
+ <Menu
modal={false}
onOpenChange={(open) => {
if (!open) setIsRemoveHighlighted(false)
}}
>
- <DropdownMenuTrigger
+ <MenuTrigger
aria-label={t(($) => $['agentDetail.configure.skills.moreActions'], {
name: displayName,
})}
@@ -413,19 +407,19 @@ function WorkspaceAgentSkillItem({
onClick={(event) => event.stopPropagation()}
>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-48">
- <DropdownMenuItem className="gap-2" onClick={handleOpenInLibrary}>
+ </MenuTrigger>
+ <MenuContent align="end" className="w-48">
+ <MenuItem className="gap-2" onClick={handleOpenInLibrary}>
<span
aria-hidden
className="i-ri-arrow-right-up-line size-4 shrink-0 text-text-tertiary"
/>
<span>{t(($) => $['agentDetail.configure.skills.openInLibrary'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
{canRemove && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ <MenuSeparator />
+ <MenuItem
data-workspace-skill-remove-action
className="group gap-2 data-highlighted:bg-state-destructive-hover data-highlighted:text-text-destructive"
onClick={() => onRemove(skill.id)}
@@ -439,11 +433,11 @@ function WorkspaceAgentSkillItem({
className="i-ri-delete-bin-line size-4 shrink-0 text-text-tertiary group-data-highlighted:text-text-destructive"
/>
<span>{t(($) => $['agentDetail.configure.skills.removeAction'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
)
}
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx
index d2c2c0d8037..6807de2de7b 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/item.tsx
@@ -4,13 +4,7 @@ import type { AgentConfigApiContext } from '../config-context'
import type { AgentSkill } from '@/features/agent-v2/agent-composer/form-state'
import { cn } from '@langgenius/dify-ui/cn'
import { Dialog } from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useQueryClient } from '@tanstack/react-query'
import { noop } from 'es-toolkit/function'
import { useCallback, useState } from 'react'
@@ -160,13 +154,13 @@ export function AgentSkillItem({
/>
)}
{hasActions && (
- <DropdownMenu
+ <Menu
modal={false}
onOpenChange={(open) => {
if (!open) setIsRemoveHighlighted(false)
}}
>
- <DropdownMenuTrigger
+ <MenuTrigger
data-agent-skill-actions
aria-label={t(($) => $['agentDetail.configure.skills.moreActions'], {
name: skill.name,
@@ -178,20 +172,20 @@ export function AgentSkillItem({
onClick={(event) => event.stopPropagation()}
>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-48">
+ </MenuTrigger>
+ <MenuContent align="end" className="w-48">
{!skill.isMissing && onDownloadSkill && (
- <DropdownMenuItem className="gap-2" onClick={onDownloadSkill}>
+ <MenuItem className="gap-2" onClick={onDownloadSkill}>
<span
aria-hidden
className="i-ri-download-line size-4 shrink-0 text-text-tertiary"
/>
<span>{tCommon(($) => $['operation.download'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- {!skill.isMissing && onDownloadSkill && canRemove && <DropdownMenuSeparator />}
+ {!skill.isMissing && onDownloadSkill && canRemove && <MenuSeparator />}
{canRemove && (
- <DropdownMenuItem
+ <MenuItem
data-agent-skill-remove-button
className="group gap-2 data-highlighted:bg-state-destructive-hover data-highlighted:text-text-destructive"
onClick={handleRemove}
@@ -205,10 +199,10 @@ export function AgentSkillItem({
className="i-ri-delete-bin-line size-4 shrink-0 text-text-tertiary group-data-highlighted:text-text-destructive"
/>
<span>{tCommon(($) => $['operation.delete'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)}
</div>
{isPreviewOpen && <AgentSkillDetailDialog skillName={skill.name} detail={detail} />}
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/tools/provider-tool/item.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/tools/provider-tool/item.tsx
index 080f85cbea3..44156bd6da4 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
@@ -9,12 +9,7 @@ import type {
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from '@langgenius/dify-ui/collapsible'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { StatusDot } from '@langgenius/dify-ui/status-dot'
import { memo, useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -329,24 +324,20 @@ export const AgentProviderToolItem = memo(
</span>
</CollapsibleTrigger>
{!readOnly && (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger className="flex size-6 shrink-0 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:bg-state-base-hover">
+ <Menu modal={false}>
+ <MenuTrigger className="flex size-6 shrink-0 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:bg-state-base-hover">
<span className="sr-only">
{t(($) => $['agentDetail.configure.tools.moreActions'], { name: tool.name })}
</span>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-44">
- <DropdownMenuItem
- variant="destructive"
- className="gap-2"
- onClick={onRemoveProvider}
- >
+ </MenuTrigger>
+ <MenuContent align="end" className="w-44">
+ <MenuItem variant="destructive" className="gap-2" onClick={onRemoveProvider}>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span>{t(($) => $['agentDetail.configure.tools.removeProvider'])}</span>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
{isInstalled === false && (
<div className="shrink-0">
diff --git a/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/version-item.tsx b/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/version-item.tsx
index 4a4940a1124..ac5c54a82d5 100644
--- a/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/version-item.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/preview/versions-panel/version-item.tsx
@@ -1,12 +1,7 @@
import type { AgentConfigSnapshotSummaryResponse } from '@dify/contracts/api/console/agent/types.gen'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import PremiumBadge from '@/app/components/base/premium-badge'
import useTimestamp from '@/hooks/use-timestamp'
@@ -101,8 +96,8 @@ export function VersionItem({
</div>
</button>
{(onExport || onRestore) && (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['roster.moreActions'], { ns: 'agentRoster', name: label })}
@@ -113,9 +108,9 @@ export function VersionItem({
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-40">
+ <MenuContent align="end" className="min-w-40">
{onRestore && (
- <DropdownMenuItem
+ <MenuItem
disabled={restoreDisabled}
onClick={() => onRestore(version)}
className="gap-2"
@@ -127,10 +122,10 @@ export function VersionItem({
{t(($) => $['upgradeBtn.encourageShort'], { ns: 'billing' })}
</PremiumBadge>
)}
- </DropdownMenuItem>
+ </MenuItem>
)}
{onExport && (
- <DropdownMenuItem
+ <MenuItem
disabled={exportDisabled}
onClick={() => onExport(version.id)}
className="gap-2"
@@ -142,10 +137,10 @@ export function VersionItem({
{t(($) => $['upgradeBtn.encourageShort'], { ns: 'billing' })}
</PremiumBadge>
)}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)}
</div>
)
diff --git a/web/features/agent-v2/agent-detail/configure/components/preview/working-directory-breadcrumb.tsx b/web/features/agent-v2/agent-detail/configure/components/preview/working-directory-breadcrumb.tsx
index af17962932d..811dcc6a70a 100644
--- a/web/features/agent-v2/agent-detail/configure/components/preview/working-directory-breadcrumb.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/preview/working-directory-breadcrumb.tsx
@@ -7,13 +7,8 @@ import {
BreadcrumbSeparator,
} from '@langgenius/dify-ui/breadcrumb'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Fragment } from 'react'
import { useTranslation } from 'react-i18next'
@@ -150,8 +145,8 @@ export function AgentWorkingDirectoryBreadcrumb({
{index === 1 && hiddenItems.length > 0 && (
<>
<BreadcrumbItem className="shrink-0">
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['operation.more'], { ns: 'common' })}
@@ -161,9 +156,9 @@ export function AgentWorkingDirectoryBreadcrumb({
</IconButton>
}
/>
- <DropdownMenuContent align="start" className="w-34 p-1">
+ <MenuContent align="start" className="w-34">
{hiddenItems.map((hiddenItem) => (
- <DropdownMenuItem
+ <MenuItem
key={hiddenItem.path}
className="gap-1 px-2 py-1.5"
onClick={() => onPathChange(hiddenItem.path)}
@@ -178,10 +173,10 @@ export function AgentWorkingDirectoryBreadcrumb({
<span className="min-w-0 truncate px-1 system-md-regular">
{hiddenItem.label}
</span>
- </DropdownMenuItem>
+ </MenuItem>
))}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</BreadcrumbItem>
<BreadcrumbSeparator className="system-xs-regular text-divider-deep" />
</>
diff --git a/web/features/agent-v2/agent-detail/sidebar-actions.tsx b/web/features/agent-v2/agent-detail/sidebar-actions.tsx
index d28702fb297..94622ba999b 100644
--- a/web/features/agent-v2/agent-detail/sidebar-actions.tsx
+++ b/web/features/agent-v2/agent-detail/sidebar-actions.tsx
@@ -3,14 +3,8 @@
import type { AgentAppPartial } from '@dify/contracts/api/console/agent/types.gen'
import type { AgentFormSource } from '@/features/agent-v2/roster/components/agent-form'
import { AlertDialog, AlertDialogContent } from '@langgenius/dify-ui/alert-dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation } from '@tanstack/react-query'
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -73,8 +67,8 @@ export function AgentDetailSidebarActions({ agent }: { agent: AgentDetailSidebar
return (
<>
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['roster.moreActions'], {
@@ -88,47 +82,43 @@ export function AgentDetailSidebarActions({ agent }: { agent: AgentDetailSidebar
</IconButton>
}
/>
- <DropdownMenuContent className="w-max min-w-40">
+ <MenuContent align="end" className="w-max min-w-40">
{capabilities.canEdit && (
- <DropdownMenuItem className="gap-2" onClick={handleEditOpen}>
+ <MenuItem className="gap-2" onClick={handleEditOpen}>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-tertiary" />
<span>{t(($) => $['roster.editInfo'], { ns: 'agentRoster' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canDuplicate && (
- <DropdownMenuItem className="gap-2" onClick={handleDuplicateOpen}>
+ <MenuItem className="gap-2" onClick={handleDuplicateOpen}>
<span
aria-hidden
className="i-ri-file-copy-line size-4 shrink-0 text-text-tertiary"
/>
<span>{tCommon(($) => $['operation.duplicate'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{capabilities.canImportExportDSL && (
- <DropdownMenuItem className="gap-2" disabled={isExporting} onClick={handleExport}>
+ <MenuItem className="gap-2" disabled={isExporting} onClick={handleExport}>
<span
aria-hidden
className="i-ri-file-download-line size-4 shrink-0 text-text-tertiary"
/>
<span>{t(($) => $.exportAgent, { ns: 'agentV2' })}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{capabilities.canDelete &&
(capabilities.canEdit || canDuplicate || capabilities.canImportExportDSL) && (
- <DropdownMenuSeparator />
+ <MenuSeparator />
)}
{capabilities.canDelete && (
- <DropdownMenuItem
- variant="destructive"
- className="gap-2"
- onClick={() => setIsDeleteOpen(true)}
- >
+ <MenuItem variant="destructive" className="gap-2" onClick={() => setIsDeleteOpen(true)}>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span>{tCommon(($) => $['operation.delete'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
{capabilities.canEdit && (
<EditAgentDialog agent={agent} open={isEditOpen} onOpenChange={setIsEditOpen} />
)}
diff --git a/web/features/agent-v2/roster/components/agent-roster-list.tsx b/web/features/agent-v2/roster/components/agent-roster-list.tsx
index 16e367e0c4e..93c5d8e90be 100644
--- a/web/features/agent-v2/roster/components/agent-roster-list.tsx
+++ b/web/features/agent-v2/roster/components/agent-roster-list.tsx
@@ -17,14 +17,8 @@ import {
ContextMenuSeparator,
ContextMenuTrigger,
} from '@langgenius/dify-ui/context-menu'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import {
ScrollArea,
ScrollAreaContent,
@@ -47,7 +41,7 @@ import useTimestamp from '@/hooks/use-timestamp'
import Link from '@/next/link'
import { consoleQuery } from '@/service/console'
import { getAdjacentFocusTargets } from '@/utils/get-adjacent-focus-targets'
-import { AgentWorkflowReferencesDropdown } from './agent-workflow-references-dropdown'
+import { AgentWorkflowReferencesMenu } from './agent-workflow-references-menu'
import { DuplicateAgentDialog } from './duplicate-agent-dialog'
import { EditAgentDialog } from './edit-agent-dialog'
@@ -175,7 +169,7 @@ function AgentRosterPlaceholderState({
}
type AgentCardActionMenuItemsProps = {
- kind: 'context' | 'dropdown'
+ kind: 'context' | 'menu'
isExporting: boolean
onDelete?: () => void
onDuplicate?: () => void
@@ -194,35 +188,35 @@ function AgentCardActionMenuItems({
const { t } = useTranslation(['agentRoster'])
const { t: tCommon } = useTranslation(['common'])
const { t: tAgent } = useTranslation(['agentV2'])
- const MenuItem = kind === 'context' ? ContextMenuItem : DropdownMenuItem
- const MenuSeparator = kind === 'context' ? ContextMenuSeparator : DropdownMenuSeparator
+ const ActionItem = kind === 'context' ? ContextMenuItem : MenuItem
+ const ActionSeparator = kind === 'context' ? ContextMenuSeparator : MenuSeparator
return (
<>
{onEdit && (
- <MenuItem className="gap-2" onClick={onEdit}>
+ <ActionItem className="gap-2" onClick={onEdit}>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-tertiary" />
<span>{t(($) => $['roster.editInfo'], { ns: 'agentRoster' })}</span>
- </MenuItem>
+ </ActionItem>
)}
{onDuplicate && (
- <MenuItem className="gap-2" onClick={onDuplicate}>
+ <ActionItem className="gap-2" onClick={onDuplicate}>
<span aria-hidden className="i-ri-file-copy-line size-4 shrink-0 text-text-tertiary" />
<span>{tCommon(($) => $['operation.duplicate'])}</span>
- </MenuItem>
+ </ActionItem>
)}
{onExport && (
- <MenuItem className="gap-2" disabled={isExporting} onClick={onExport}>
+ <ActionItem className="gap-2" disabled={isExporting} onClick={onExport}>
<span aria-hidden className="i-ri-download-line size-4 shrink-0 text-text-tertiary" />
<span>{tAgent(($) => $.exportAgent)}</span>
- </MenuItem>
+ </ActionItem>
)}
- {onDelete && (onEdit || onDuplicate || onExport) && <MenuSeparator />}
+ {onDelete && (onEdit || onDuplicate || onExport) && <ActionSeparator />}
{onDelete && (
- <MenuItem variant="destructive" className="gap-2" onClick={onDelete}>
+ <ActionItem variant="destructive" className="gap-2" onClick={onDelete}>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span>{tCommon(($) => $['operation.delete'])}</span>
- </MenuItem>
+ </ActionItem>
)}
</>
)
@@ -389,8 +383,8 @@ function AgentRosterItem({
{hasActions && (
<div className="pointer-events-none absolute inset-e-[-0.5px] top-[-0.5px] flex h-16 w-30 items-start justify-end bg-[linear-gradient(67deg,var(--color-components-card-bg-alt-transparent)_0%,var(--color-components-card-bg-alt)_75%)] p-2 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 has-data-popup-open:opacity-100 rtl:bg-[linear-gradient(293deg,var(--color-components-card-bg-alt-transparent)_0%,var(--color-components-card-bg-alt)_75%)] [@media(hover:none)]:opacity-100">
<div className="pointer-events-none flex items-center overflow-hidden rounded-[10px] border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg p-0.5 shadow-lg backdrop-blur-xs group-focus-within:pointer-events-auto group-hover:pointer-events-auto has-data-popup-open:pointer-events-auto [@media(hover:none)]:pointer-events-auto">
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['roster.moreActions'], {
@@ -404,24 +398,24 @@ function AgentRosterItem({
</IconButton>
}
/>
- <DropdownMenuContent className="w-max min-w-40">
+ <MenuContent align="end" className="w-max min-w-40">
<AgentCardActionMenuItems
- kind="dropdown"
+ kind="menu"
isExporting={isExporting}
onEdit={capabilities.canEdit ? handleEditOpen : undefined}
onDuplicate={canDuplicate ? handleDuplicateOpen : undefined}
onExport={capabilities.canImportExportDSL ? handleExport : undefined}
onDelete={capabilities.canDelete ? () => onDelete(itemRef.current) : undefined}
/>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
</div>
)}
<div className="pointer-events-none absolute inset-x-0 bottom-0 flex min-w-0 items-center pt-2 pr-3 pb-3 pl-4 system-xs-regular text-text-tertiary">
<div className="flex min-w-0 flex-1 items-center gap-1.5">
{hasPublishedReferences ? (
- <AgentWorkflowReferencesDropdown
+ <AgentWorkflowReferencesMenu
agentName={agent.name}
publishedReferences={publishedReferences}
referenceCount={referenceCount}
diff --git a/web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx b/web/features/agent-v2/roster/components/agent-workflow-references-menu.tsx
similarity index 66%
rename from web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx
rename to web/features/agent-v2/roster/components/agent-workflow-references-menu.tsx
index b41c04aea4b..e33214600fc 100644
--- a/web/features/agent-v2/roster/components/agent-workflow-references-dropdown.tsx
+++ b/web/features/agent-v2/roster/components/agent-workflow-references-menu.tsx
@@ -2,13 +2,13 @@
import type { AgentAppPublishedReferenceResponse } from '@dify/contracts/api/console/agent/types.gen'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuGroup,
- DropdownMenuGroupLabel,
- DropdownMenuLinkItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuGroup,
+ MenuGroupLabel,
+ MenuLinkItem,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import AppIcon from '@/app/components/base/app-icon'
import Link from '@/next/link'
@@ -16,7 +16,7 @@ import Link from '@/next/link'
const getWorkflowReferenceHref = (reference: AgentAppPublishedReferenceResponse) =>
`/app/${reference.app_id}/workflow`
-export function AgentWorkflowReferencesDropdown({
+export function AgentWorkflowReferencesMenu({
agentName,
publishedReferences,
referenceCount,
@@ -28,8 +28,8 @@ export function AgentWorkflowReferencesDropdown({
const { t } = useTranslation(['agentRoster'])
return (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger className="pointer-events-auto relative -m-1 flex h-6 shrink-0 cursor-pointer items-center gap-1 rounded-md p-1 before:pointer-events-none before:absolute before:inset-0 before:rounded-md before:content-[''] hover:before:bg-state-base-hover data-popup-open:before:bg-state-base-hover">
+ <Menu modal={false}>
+ <MenuTrigger className="pointer-events-auto relative -m-1 flex h-6 shrink-0 cursor-pointer items-center gap-1 rounded-md p-1 before:pointer-events-none before:absolute before:inset-0 before:rounded-md before:content-[''] hover:before:bg-state-base-hover data-popup-open:before:bg-state-base-hover">
<span
aria-hidden
className="i-custom-vender-agent-v2-plan size-3 shrink-0 text-text-tertiary"
@@ -38,15 +38,15 @@ export function AgentWorkflowReferencesDropdown({
{t(($) => $['roster.references.trigger'], { ns: 'agentRoster', name: agentName })}:{' '}
</span>
<span className="system-xs-regular text-text-tertiary">{referenceCount}</span>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start" className="w-66 p-1">
- <DropdownMenuGroup>
- <DropdownMenuGroupLabel className="flex w-full min-w-0 truncate pt-2 pr-3 pb-1.5 pl-2 system-xs-medium normal-case">
+ </MenuTrigger>
+ <MenuContent align="start" className="w-66">
+ <MenuGroup>
+ <MenuGroupLabel className="flex w-full min-w-0 truncate ps-3 pe-4 pt-2 pb-1.5 system-xs-medium normal-case">
{t(($) => $['roster.references.label'], { ns: 'agentRoster', name: agentName })}
- </DropdownMenuGroupLabel>
+ </MenuGroupLabel>
{publishedReferences.map((reference) => {
return (
- <DropdownMenuLinkItem
+ <MenuLinkItem
key={reference.app_id}
render={
<Link
@@ -55,7 +55,7 @@ export function AgentWorkflowReferencesDropdown({
rel="noopener noreferrer"
/>
}
- className="group mx-0 gap-2 py-1 pr-2.5 system-md-regular text-text-secondary"
+ className="group gap-2 py-1 pr-2.5 system-md-regular text-text-secondary"
>
<span aria-hidden className="shrink-0">
<AppIcon
@@ -73,11 +73,11 @@ export function AgentWorkflowReferencesDropdown({
aria-hidden
className="i-ri-external-link-line size-3 shrink-0 text-text-quaternary group-data-highlighted:text-text-secondary [&:dir(rtl)]:-scale-x-100"
/>
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)
})}
- </DropdownMenuGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/features/agent-v2/roster/components/roster-create-menu.tsx b/web/features/agent-v2/roster/components/roster-create-menu.tsx
index 7ef6baaf749..4517b8f1b2f 100644
--- a/web/features/agent-v2/roster/components/roster-create-menu.tsx
+++ b/web/features/agent-v2/roster/components/roster-create-menu.tsx
@@ -4,7 +4,7 @@ import { useQueryClient } from '@tanstack/react-query'
import { useAtomValue } from 'jotai'
import { useState } from 'react'
import CreateAppTemplateDialog from '@/app/components/app/create-app-dialog'
-import { CreateAppDropdown } from '@/app/components/app/create-app-dropdown'
+import { CreateAppMenu } from '@/app/components/app/create-app-menu'
import CreateFromDSLModal from '@/app/components/app/create-from-dsl-modal'
import { useCanCreateAgents, useCanImportAgents } from '@/features/agent-v2/permissions'
import { deploymentEditionAtom } from '@/features/system-features/state'
@@ -25,7 +25,7 @@ export function RosterCreateMenu() {
return (
<>
- <CreateAppDropdown
+ <CreateAppMenu
onCreateBlank={canCreate ? () => setCreateDialogOpen(true) : undefined}
onImportDSL={canImport ? () => setImportDialogOpen(true) : undefined}
onCreateTemplate={canCreateFromTemplate ? () => setTemplateDialogOpen(true) : undefined}
diff --git a/web/features/app-access-error/locale-menu.tsx b/web/features/app-access-error/locale-menu.tsx
index e4595577e90..dc71f268eef 100644
--- a/web/features/app-access-error/locale-menu.tsx
+++ b/web/features/app-access-error/locale-menu.tsx
@@ -1,13 +1,13 @@
import type { Locale } from '@/i18n'
import { useDirection } from '@langgenius/dify-ui/direction-provider'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuRadioGroup,
- DropdownMenuRadioItem,
- DropdownMenuRadioItemIndicator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuRadioGroup,
+ MenuRadioItem,
+ MenuRadioItemIndicator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { languages } from '@/i18n/language'
const supportedLanguages = languages.filter((language) => language.supported)
@@ -25,8 +25,8 @@ export default function LocaleMenu({
selectedLanguage?.value === 'en-US' ? selectedLanguage.prompt_name : selectedLanguage?.name
return (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={
<button
type="button"
@@ -38,22 +38,22 @@ export default function LocaleMenu({
{/* oxlint-disable-next-line dify/require-title-for-truncated-text -- The language menu exposes the full selected label through pointer, keyboard, and touch. */}
<span className="truncate">{selectedLanguageName}</span>
<span aria-hidden className="i-ri-arrow-down-s-line size-4 shrink-0" />
- </DropdownMenuTrigger>
- <DropdownMenuContent dir={direction} className="max-h-80 w-60 overflow-y-auto">
- <DropdownMenuRadioGroup<Locale>
+ </MenuTrigger>
+ <MenuContent dir={direction} className="max-h-80 w-60 overflow-y-auto">
+ <MenuRadioGroup<Locale>
value={locale}
onValueChange={(value) => {
onChange(value)
}}
>
{supportedLanguages.map((language) => (
- <DropdownMenuRadioItem<Locale> key={language.value} value={language.value} closeOnClick>
+ <MenuRadioItem<Locale> key={language.value} value={language.value} closeOnClick>
<span className="grow">{language.name}</span>
- <DropdownMenuRadioItemIndicator />
- </DropdownMenuRadioItem>
+ <MenuRadioItemIndicator />
+ </MenuRadioItem>
))}
- </DropdownMenuRadioGroup>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuRadioGroup>
+ </MenuContent>
+ </Menu>
)
}
diff --git a/web/features/new-rag/documents/actions-dropdown.tsx b/web/features/new-rag/documents/actions-menu.tsx
similarity index 93%
rename from web/features/new-rag/documents/actions-dropdown.tsx
rename to web/features/new-rag/documents/actions-menu.tsx
index df4897aaada..21a223a046f 100644
--- a/web/features/new-rag/documents/actions-dropdown.tsx
+++ b/web/features/new-rag/documents/actions-menu.tsx
@@ -12,14 +12,8 @@ import {
DialogHeader,
DialogTitle,
} from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Input } from '@langgenius/dify-ui/input'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useAtomValueRawSync } from 'jotai'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -63,14 +57,14 @@ function RenameDocumentMenuItem({
const busy = useDocumentRowActionBusy(document.id)
return (
- <DropdownMenuItem
+ <MenuItem
className="mb-px h-7 gap-2 px-2 system-sm-medium"
disabled={!canEdit || busy}
onClick={onOpen}
>
<span aria-hidden className="i-ri-edit-line size-4" />
{tCommon(($) => $['operation.rename'])}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -143,7 +137,7 @@ function RetryDocumentMenuItem({ document }: { document: LogicalDocument }) {
const unavailableReasonId = `new-document-${document.id}-actions-unavailable`
return (
- <DropdownMenuItem
+ <MenuItem
aria-describedby={disabled ? unavailableReasonId : undefined}
className="mb-px h-7 gap-2 px-2 system-sm-medium"
disabled={busy || disabled}
@@ -151,7 +145,7 @@ function RetryDocumentMenuItem({ document }: { document: LogicalDocument }) {
>
<span aria-hidden className="i-ri-restart-line size-4" />
{t(($) => $.retryTask)}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -163,7 +157,7 @@ function ReindexDocumentMenuItem({ document }: { document: LogicalDocument }) {
const disabled = !canEdit || !documentCanReindex(status)
return (
- <DropdownMenuItem
+ <MenuItem
aria-describedby={disabled ? `new-document-${document.id}-actions-unavailable` : undefined}
className="mb-px h-7 gap-2 px-2 system-sm-medium"
disabled={busy || disabled}
@@ -171,7 +165,7 @@ function ReindexDocumentMenuItem({ document }: { document: LogicalDocument }) {
>
<span aria-hidden className="i-ri-loop-left-line size-4" />
{t(($) => $.reindexDocument, { ns: 'knowledgeDocuments' })}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -192,7 +186,7 @@ function DownloadDocumentMenuItem({ document }: { document: LogicalDocument }) {
const disabled = !canDownload || documentSnapshotPending || !documentCanDownload(document, status)
return (
- <DropdownMenuItem
+ <MenuItem
aria-describedby={disabled ? `new-document-${document.id}-actions-unavailable` : undefined}
className="mb-px h-7 gap-2 px-2 system-sm-medium"
disabled={busy || disabled}
@@ -200,7 +194,7 @@ function DownloadDocumentMenuItem({ document }: { document: LogicalDocument }) {
>
<span aria-hidden className="i-ri-download-line size-4" />
{t(($) => $.downloadDocuments, { ns: 'knowledgeDocuments' })}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -214,7 +208,7 @@ function ToggleDocumentAvailabilityMenuItem({ document }: { document: LogicalDoc
!canEdit || document.status === 'deleting' || !documentCanToggleAvailability(status)
return (
- <DropdownMenuItem
+ <MenuItem
aria-describedby={disabled ? `new-document-${document.id}-actions-unavailable` : undefined}
className="mb-px h-7 gap-2 px-2 system-sm-medium"
disabled={busy || disabled}
@@ -228,7 +222,7 @@ function ToggleDocumentAvailabilityMenuItem({ document }: { document: LogicalDoc
)}
/>
{document.enabled ? t(($) => $.disableSource) : t(($) => $.enable, { ns: 'dataset' })}
- </DropdownMenuItem>
+ </MenuItem>
)
}
@@ -245,7 +239,7 @@ function RemoveDocumentMenuItem({
const disabled = !canEdit || document.status === 'deleting'
return (
- <DropdownMenuItem
+ <MenuItem
aria-describedby={disabled ? `new-document-${document.id}-actions-unavailable` : undefined}
className="h-7 gap-2 px-2 system-sm-medium"
disabled={busy || disabled}
@@ -254,11 +248,11 @@ function RemoveDocumentMenuItem({
>
<span aria-hidden className="i-ri-delete-bin-line size-4" />
{tCommon(($) => $['operation.delete'])}
- </DropdownMenuItem>
+ </MenuItem>
)
}
-export function DocumentActionsDropdown({
+export function DocumentActionsMenu({
className,
document,
onRemove,
@@ -274,8 +268,8 @@ export function DocumentActionsDropdown({
return (
<>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={t(($) => $.documentActions, {
ns: 'knowledgeDocuments',
name: document.title,
@@ -295,16 +289,16 @@ export function DocumentActionsDropdown({
: 'i-ri-more-fill',
)}
/>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-50">
+ </MenuTrigger>
+ <MenuContent align="end" className="w-50">
<RenameDocumentMenuItem document={document} onOpen={() => setRenameDialogOpen(true)} />
<ReprocessDocumentMenuItem document={document} />
<DownloadDocumentMenuItem document={document} />
<ToggleDocumentAvailabilityMenuItem document={document} />
- <DropdownMenuSeparator className="my-px" />
+ <MenuSeparator className="my-px" />
<RemoveDocumentMenuItem document={document} onOpen={onRemove} />
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<span id={unavailableReasonId} className="sr-only">
{t(($) => $.documentActionsUnavailable, { ns: 'knowledgeDocuments' })}
</span>
diff --git a/web/features/new-rag/documents/list.tsx b/web/features/new-rag/documents/list.tsx
index 673655bff52..304c6d264e2 100644
--- a/web/features/new-rag/documents/list.tsx
+++ b/web/features/new-rag/documents/list.tsx
@@ -30,7 +30,7 @@ import { knowledgeFsUploadEnabledAtom } from '@/features/knowledge-fs-availabili
import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'
import Link from '@/next/link'
import { newKnowledgeDocumentDetailPath } from '../routes'
-import { DocumentActionsDropdown } from './actions-dropdown'
+import { DocumentActionsMenu } from './actions-menu'
import { DocumentBulkActionsToolbar } from './bulk/toolbar'
import { DocumentPermissionRecoveryBulkRegion } from './permission-recovery/recovery-boundary'
import {
@@ -337,7 +337,7 @@ const DocumentRow = memo(
<DocumentStatusCell documentId={document.id} />
<DocumentUpdatedCell updatedAt={document.updatedAt} />
<td className="w-10 align-middle">
- <DocumentActionsDropdown document={document} onRemove={() => onRemove(rowRef.current)} />
+ <DocumentActionsMenu document={document} onRemove={() => onRemove(rowRef.current)} />
</td>
</tr>
)
diff --git a/web/features/new-rag/list/knowledge-space-actions.tsx b/web/features/new-rag/list/knowledge-space-actions.tsx
index 0bbedd4deaf..63006e515a2 100644
--- a/web/features/new-rag/list/knowledge-space-actions.tsx
+++ b/web/features/new-rag/list/knowledge-space-actions.tsx
@@ -1,15 +1,15 @@
'use client'
import type { KnowledgeFsSpaceListItemResponse } from '@dify/contracts/api/console/knowledge-fs/types.gen'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
+import {
+ Menu,
+ MenuContent,
+ MenuItem,
+ MenuLinkItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useTranslation } from 'react-i18next'
import Link from '@/next/link'
import { newKnowledgeSettingsPath } from '../routes'
@@ -29,8 +29,8 @@ export function KnowledgeSpaceActions({
return (
<div className="pointer-events-none absolute top-0 right-0 flex h-16 w-30 items-start justify-end bg-linear-65 from-components-card-bg-alt-transparent to-components-card-bg-alt to-75% p-2 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 has-data-popup-open:opacity-100 [@media(hover:none)]:opacity-100">
<div className="pointer-events-auto flex items-center overflow-hidden rounded-[10px] border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg p-0.5 shadow-lg backdrop-blur-xs">
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<IconButton
aria-label={tCommon(($) => $['operation.more'])}
@@ -41,26 +41,26 @@ export function KnowledgeSpaceActions({
</IconButton>
}
/>
- <DropdownMenuContent className="min-w-46.5">
+ <MenuContent align="end" className="min-w-46.5">
{canEdit && (
- <DropdownMenuLinkItem
+ <MenuLinkItem
render={<Link href={newKnowledgeSettingsPath(knowledgeSpace.control_space_id)} />}
>
<span aria-hidden className="mr-1 i-ri-edit-line size-4 text-text-tertiary" />
{tCommon(($) => $['operation.edit'])}
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)}
{canDelete && (
<>
- {canEdit && <DropdownMenuSeparator />}
- <DropdownMenuItem variant="destructive" onClick={onDelete}>
+ {canEdit && <MenuSeparator />}
+ <MenuItem variant="destructive" onClick={onDelete}>
<span aria-hidden className="mr-1 i-ri-delete-bin-line size-4" />
{tCommon(($) => $['operation.delete'])}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
</div>
)
diff --git a/web/features/new-rag/quality/bad-cases-panel.tsx b/web/features/new-rag/quality/bad-cases-panel.tsx
index 748494b1ea4..c40b91cf2f8 100644
--- a/web/features/new-rag/quality/bad-cases-panel.tsx
+++ b/web/features/new-rag/quality/bad-cases-panel.tsx
@@ -4,12 +4,7 @@ import type { KnowledgeFsBadCaseResponse } from '@dify/contracts/api/console/kno
import type { GoldenQuestionDraft } from './types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuSeparator } from '@langgenius/dify-ui/menu'
import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -288,7 +283,7 @@ function BadCaseRow({
{formatQualityUpdatedAt(item.updated_at, i18n.language)}
</td>
<td>
- <DropdownMenu modal={false}>
+ <Menu modal={false}>
<QualityRowMenuTrigger
disabled={pending}
label={t(($) => $['qualityPage.questionActions'], {
@@ -296,54 +291,46 @@ function BadCaseRow({
question: item.question ?? '',
})}
/>
- <DropdownMenuContent className="w-50">
+ <MenuContent align="end" className="w-50">
{canEdit &&
(item.status === 'fixed' ? (
- <DropdownMenuItem className="gap-2 px-3" onClick={() => onPromote(item)}>
+ <MenuItem className="gap-2 px-3" onClick={() => onPromote(item)}>
<span aria-hidden className="i-ri-star-line size-4" />
{t(($) => $['qualityPage.toGolden'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
+ </MenuItem>
) : (
- <DropdownMenuItem
+ <MenuItem
className="gap-2 px-3"
disabled={item.status === 'replaying' || pending}
onClick={() => void openTrace(true)}
>
<span aria-hidden className="i-ri-restart-line size-4" />
{t(($) => $['qualityPage.replay'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
+ </MenuItem>
))}
- <DropdownMenuItem
+ <MenuItem
className="gap-2 px-3"
disabled={pending}
onClick={() => void openTrace(false)}
>
<span aria-hidden className="i-ri-arrow-right-up-line size-4" />
{t(($) => $['qualityPage.openTrace'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
+ </MenuItem>
{canEdit && item.status !== 'fixed' && (
- <DropdownMenuItem
- className="gap-2 px-3"
- disabled={pending}
- onClick={() => onPromote(item)}
- >
+ <MenuItem className="gap-2 px-3" disabled={pending} onClick={() => onPromote(item)}>
<span aria-hidden className="i-ri-star-line size-4" />
{t(($) => $['qualityPage.toGolden'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- {canEdit && <DropdownMenuSeparator />}
+ {canEdit && <MenuSeparator />}
{canEdit && (
- <DropdownMenuItem
- className="gap-2 px-3"
- disabled={pending}
- onClick={() => void ignore()}
- >
+ <MenuItem className="gap-2 px-3" disabled={pending} onClick={() => void ignore()}>
<span aria-hidden className="i-ri-eye-off-line size-4" />
{t(($) => $['qualityPage.ignore'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</td>
</tr>
)
diff --git a/web/features/new-rag/quality/golden-questions-panel.tsx b/web/features/new-rag/quality/golden-questions-panel.tsx
index 3fbf6359071..c67f23ab5ef 100644
--- a/web/features/new-rag/quality/golden-questions-panel.tsx
+++ b/web/features/new-rag/quality/golden-questions-panel.tsx
@@ -15,13 +15,8 @@ import {
import { Button } from '@langgenius/dify-ui/button'
import { Checkbox } from '@langgenius/dify-ui/checkbox'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Infotip, InfotipContent, InfotipTrigger } from '@langgenius/dify-ui/infotip'
+import { Menu, MenuContent, MenuItem, MenuSeparator } from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query'
import { useId, useState } from 'react'
@@ -425,32 +420,29 @@ export function GoldenQuestionsPanel({ actionSlot }: GoldenQuestionsPanelProps)
</td>
<td>
{canEdit && (
- <DropdownMenu modal={false}>
+ <Menu modal={false}>
<QualityRowMenuTrigger
label={t(($) => $['qualityPage.questionActions'], {
ns: 'knowledgeQuality',
question: item.question,
})}
/>
- <DropdownMenuContent className="w-50">
- <DropdownMenuItem
- className="gap-2 px-3"
- onClick={() => void openEdit(item)}
- >
+ <MenuContent align="end" className="w-50">
+ <MenuItem className="gap-2 px-3" onClick={() => void openEdit(item)}>
<span aria-hidden className="i-ri-edit-line size-4" />
{t(($) => $['qualityPage.edit'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ </MenuItem>
+ <MenuSeparator />
+ <MenuItem
variant="destructive"
className="gap-2 px-3"
onClick={() => setDeleteIds(new Set([item.id]))}
>
<span aria-hidden className="i-ri-delete-bin-line size-4" />
{t(($) => $['qualityPage.delete'], { ns: 'knowledgeQuality' })}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
</td>
</tr>
diff --git a/web/features/new-rag/quality/quality-row-menu-trigger.tsx b/web/features/new-rag/quality/quality-row-menu-trigger.tsx
index 6ad01015e41..206e51c64b3 100644
--- a/web/features/new-rag/quality/quality-row-menu-trigger.tsx
+++ b/web/features/new-rag/quality/quality-row-menu-trigger.tsx
@@ -1,13 +1,13 @@
-import { DropdownMenuTrigger } from '@langgenius/dify-ui/dropdown-menu'
+import { MenuTrigger } from '@langgenius/dify-ui/menu'
export function QualityRowMenuTrigger({ disabled, label }: { disabled?: boolean; label: string }) {
return (
- <DropdownMenuTrigger
+ <MenuTrigger
aria-label={label}
disabled={disabled}
className="ml-auto flex size-7 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover disabled:cursor-not-allowed disabled:text-text-disabled"
>
<span aria-hidden className="i-ri-more-fill size-4.5" />
- </DropdownMenuTrigger>
+ </MenuTrigger>
)
}
diff --git a/web/features/new-rag/retrieval/results.tsx b/web/features/new-rag/retrieval/results.tsx
index 8a9a946b144..d66b120499b 100644
--- a/web/features/new-rag/retrieval/results.tsx
+++ b/web/features/new-rag/retrieval/results.tsx
@@ -5,12 +5,7 @@ import type { RetrievalEvidence } from './model'
import type { MarkdownProps } from '@/app/components/base/markdown'
import { Button, buttonVariants } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useAtomValueRawSync } from 'jotai'
import { createContext, use, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -500,22 +495,22 @@ export function QualityActions({
return (
<div className="flex shrink-0 items-center justify-end gap-3 border-t border-divider-regular pt-4 pb-1">
{badCaseAvailable && (
- <DropdownMenu>
- <DropdownMenuTrigger
+ <Menu>
+ <MenuTrigger
render={<Button loading={pending} variant={noResults ? 'secondary' : 'ghost'} />}
>
<span aria-hidden className="i-ri-thumb-down-line size-4" />
{t(($) => $['retrievalTest.makeBadCase'], { ns: 'knowledgeRetrieval' })}
- </DropdownMenuTrigger>
- <DropdownMenuContent side="top" className="w-44">
- <DropdownMenuItem onClick={() => void onBadCase('low-score')}>
+ </MenuTrigger>
+ <MenuContent side="top" className="w-44">
+ <MenuItem onClick={() => void onBadCase('low-score')}>
{t(($) => $['qualityPage.reasonValues.lowScore'], { ns: 'knowledgeSpace' })}
- </DropdownMenuItem>
- <DropdownMenuItem onClick={() => void onBadCase('retrieval-miss')}>
+ </MenuItem>
+ <MenuItem onClick={() => void onBadCase('retrieval-miss')}>
{t(($) => $['qualityPage.reasonValues.retrievalMiss'], { ns: 'knowledgeSpace' })}
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuItem>
+ </MenuContent>
+ </Menu>
)}
{!noResults && (
<Button loading={pending} variant="secondary" onClick={() => void onGolden()}>
diff --git a/web/features/new-rag/sources/source-actions.tsx b/web/features/new-rag/sources/source-actions.tsx
index a4c28bc081c..ee63be2bd46 100644
--- a/web/features/new-rag/sources/source-actions.tsx
+++ b/web/features/new-rag/sources/source-actions.tsx
@@ -15,13 +15,13 @@ import {
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLinkItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+ Menu,
+ MenuContent,
+ MenuItem,
+ MenuLinkItem,
+ MenuSeparator,
+ MenuTrigger,
+} from '@langgenius/dify-ui/menu'
import { useQueryClient } from '@tanstack/react-query'
import { useAtomValue, useSetAtom } from 'jotai'
import { useState } from 'react'
@@ -239,8 +239,8 @@ export function SourceActions({
{tCommon(($) => $['operation.retry'])}
</Button>
)}
- <DropdownMenu modal={false} open={menuOpen} onOpenChange={setMenuOpen}>
- <DropdownMenuTrigger
+ <Menu modal={false} open={menuOpen} onOpenChange={setMenuOpen}>
+ <MenuTrigger
aria-label={t(($) => $.sourceActions, { ns: 'knowledgeSources', name: source.name })}
disabled={Boolean(pendingAction)}
className="flex size-7 items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover disabled:cursor-not-allowed disabled:text-text-disabled"
@@ -252,10 +252,10 @@ export function SourceActions({
pendingAction ? 'i-ri-loader-4-line animate-spin' : 'i-ri-more-fill',
)}
/>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-50">
+ </MenuTrigger>
+ <MenuContent align="end" className="w-50">
{canSync && (
- <DropdownMenuItem
+ <MenuItem
onClick={() => void (syncAction === 'retry' ? retrySource() : syncSource())}
className="mb-px h-7 gap-2 px-2 system-sm-medium"
>
@@ -263,10 +263,10 @@ export function SourceActions({
{syncAction === 'retry'
? tCommon(($) => $['operation.retry'])
: t(($) => $.syncNow, { ns: 'knowledgeSources' })}
- </DropdownMenuItem>
+ </MenuItem>
)}
{sourceUri && (
- <DropdownMenuLinkItem
+ <MenuLinkItem
render={
<a
aria-label={t(($) => $.openSource)}
@@ -279,19 +279,16 @@ export function SourceActions({
>
<span aria-hidden className="i-ri-external-link-line size-4" />
{t(($) => $.openSource)}
- </DropdownMenuLinkItem>
+ </MenuLinkItem>
)}
{canEdit && (
- <DropdownMenuItem
- onClick={openEditDialog}
- className="mb-px h-7 gap-2 px-2 system-sm-medium"
- >
+ <MenuItem onClick={openEditDialog} className="mb-px h-7 gap-2 px-2 system-sm-medium">
<span aria-hidden className="i-ri-edit-line size-4" />
{tCommon(($) => $['operation.edit'])}
- </DropdownMenuItem>
+ </MenuItem>
)}
{canToggle && (
- <DropdownMenuItem
+ <MenuItem
onClick={() => void toggleSource()}
className="h-7 gap-2 px-2 system-sm-medium"
>
@@ -307,14 +304,14 @@ export function SourceActions({
{source.status === 'disabled'
? t(($) => $.enable, { ns: 'dataset' })
: t(($) => $.disableSource)}
- </DropdownMenuItem>
+ </MenuItem>
)}
{canRemove && (
<>
{(canEdit || canSync || canToggle || sourceUri) && (
- <DropdownMenuSeparator className="my-px" />
+ <MenuSeparator className="my-px" />
)}
- <DropdownMenuItem
+ <MenuItem
onClick={() => {
setMenuOpen(false)
setRemoveDialogOpen(true)
@@ -324,11 +321,11 @@ export function SourceActions({
>
<span aria-hidden className="i-ri-delete-bin-line size-4" />
{t(($) => $.removeSource, { ns: 'knowledgeSources' })}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<SourceEditDialog
controlSpaceId={knowledgeSpaceId}
onEdit={editSource}
diff --git a/web/features/skills/__tests__/detail-page-clipboard.spec.tsx b/web/features/skills/__tests__/detail-page-clipboard.spec.tsx
index b99116ce8a9..e158921d0bb 100644
--- a/web/features/skills/__tests__/detail-page-clipboard.spec.tsx
+++ b/web/features/skills/__tests__/detail-page-clipboard.spec.tsx
@@ -1,9 +1,4 @@
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
+import { Menu, MenuContent, MenuItem, MenuTrigger } from '@langgenius/dify-ui/menu'
import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vite-plus/test'
@@ -73,12 +68,12 @@ describe('SkillDetailPage clipboard', () => {
renderSkillDetailPage()
await waitFor(() => expect(getFileTreeItem('SKILL.md')).toBeInTheDocument())
render(
- <DropdownMenu>
- <DropdownMenuTrigger>Other actions</DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem>Other copy</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>,
+ <Menu>
+ <MenuTrigger>Other actions</MenuTrigger>
+ <MenuContent>
+ <MenuItem>Other copy</MenuItem>
+ </MenuContent>
+ </Menu>,
)
await user.click(screen.getByRole('button', { name: 'Other actions' }))
const menuItem = await screen.findByRole('menuitem', { name: 'Other copy' })
diff --git a/web/features/skills/detail/file-tree-items.tsx b/web/features/skills/detail/file-tree-items.tsx
index 8e29fd4025f..fe84fd4751a 100644
--- a/web/features/skills/detail/file-tree-items.tsx
+++ b/web/features/skills/detail/file-tree-items.tsx
@@ -15,14 +15,8 @@ import {
ContextMenuSeparator,
ContextMenuTrigger,
} from '@langgenius/dify-ui/context-menu'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Kbd, KbdGroup } from '@langgenius/dify-ui/kbd'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { formatForDisplay, matchesKeyboardEvent } from '@tanstack/react-hotkeys'
import { useEffect, useLayoutEffect, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -136,7 +130,7 @@ function FileActionMenuItems({
onRename,
onUploadFiles,
}: {
- kind: 'context' | 'dropdown'
+ kind: 'context' | 'menu'
node: FileTreeNode
onCopy: (path: string) => void
onCreateFile: () => void
@@ -148,15 +142,15 @@ function FileActionMenuItems({
}) {
const { t } = useTranslation(['skill'])
const { t: tCommon } = useTranslation(['common'])
- const MenuItem = kind === 'context' ? ContextMenuItem : DropdownMenuItem
- const MenuSeparator = kind === 'context' ? ContextMenuSeparator : DropdownMenuSeparator
+ const ActionItem = kind === 'context' ? ContextMenuItem : MenuItem
+ const ActionSeparator = kind === 'context' ? ContextMenuSeparator : MenuSeparator
const isDirectoryNode = node.type === 'directory'
return (
<>
{!isDirectoryNode && (
<>
- <MenuItem
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -170,8 +164,8 @@ function FileActionMenuItems({
<Kbd key={keycap}>{keycap}</Kbd>
))}
</KbdGroup>
- </MenuItem>
- <MenuItem
+ </ActionItem>
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -185,13 +179,13 @@ function FileActionMenuItems({
<Kbd key={keycap}>{keycap}</Kbd>
))}
</KbdGroup>
- </MenuItem>
- <MenuSeparator />
+ </ActionItem>
+ <ActionSeparator />
</>
)}
{isDirectoryNode && (
<>
- <MenuItem
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -200,8 +194,8 @@ function FileActionMenuItems({
>
<span aria-hidden className="i-ri-file-add-line size-4 text-text-tertiary" />
<span>{t(($) => $['skillManagement.detail.createFileMenu'])}</span>
- </MenuItem>
- <MenuItem
+ </ActionItem>
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -210,8 +204,8 @@ function FileActionMenuItems({
>
<span aria-hidden className="i-ri-folder-add-line size-4 text-text-tertiary" />
<span>{t(($) => $['skillManagement.detail.createFolderMenu'])}</span>
- </MenuItem>
- <MenuItem
+ </ActionItem>
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -220,11 +214,11 @@ function FileActionMenuItems({
>
<span aria-hidden className="i-ri-upload-cloud-2-line size-4 text-text-tertiary" />
<span>{t(($) => $['skillManagement.detail.uploadFilesMenu'])}</span>
- </MenuItem>
- <MenuSeparator />
+ </ActionItem>
+ <ActionSeparator />
</>
)}
- <MenuItem
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -233,9 +227,9 @@ function FileActionMenuItems({
>
<span aria-hidden className="i-ri-input-field size-4 text-text-tertiary" />
<span>{tCommon(($) => $['operation.rename'])}...</span>
- </MenuItem>
- <MenuSeparator />
- <MenuItem
+ </ActionItem>
+ <ActionSeparator />
+ <ActionItem
className="gap-2"
onClick={(event) => {
event.stopPropagation()
@@ -244,7 +238,7 @@ function FileActionMenuItems({
>
<span aria-hidden className="i-ri-delete-bin-line size-4 text-text-tertiary" />
<span>{tCommon(($) => $['operation.delete'])}</span>
- </MenuItem>
+ </ActionItem>
</>
)
}
@@ -277,8 +271,8 @@ function FileActions({
return (
<>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={tCommon(($) => $['operation.more'])}
className={cn(
'relative z-10 size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:flex data-popup-open:bg-state-base-hover',
@@ -287,14 +281,15 @@ function FileActions({
onClick={(event) => event.stopPropagation()}
>
<span aria-hidden className="i-ri-more-fill size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent
+ </MenuTrigger>
+ <MenuContent
+ align="end"
data-skill-file-menu
onKeyDown={onMenuKeyDown}
className={skillFileMenuPopupClassName}
>
<FileActionMenuItems
- kind="dropdown"
+ kind="menu"
node={node}
onCopy={onCopy}
onCreateFile={onCreateFile}
@@ -304,8 +299,8 @@ function FileActions({
onRename={onRename}
onUploadFiles={() => uploadInputRef.current?.click()}
/>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<input
ref={uploadInputRef}
type="file"
@@ -326,34 +321,34 @@ export function RootFileActionMenuItems({
onCreateFolder,
onUploadFiles,
}: {
- kind: 'context' | 'dropdown'
+ kind: 'context' | 'menu'
onCreateFile: () => void
onCreateFolder: () => void
onUploadFiles: () => void
}) {
const { t } = useTranslation(['skill'])
- const MenuItem = kind === 'context' ? ContextMenuItem : DropdownMenuItem
+ const ActionItem = kind === 'context' ? ContextMenuItem : MenuItem
return (
<>
- <MenuItem className="gap-2" onClick={onCreateFile}>
+ <ActionItem className="gap-2" onClick={onCreateFile}>
<span aria-hidden className="i-ri-file-add-line size-4 text-text-secondary" />
<span className="system-sm-regular">
{t(($) => $['skillManagement.detail.createFileMenu'])}
</span>
- </MenuItem>
- <MenuItem className="gap-2" onClick={onCreateFolder}>
+ </ActionItem>
+ <ActionItem className="gap-2" onClick={onCreateFolder}>
<span aria-hidden className="i-ri-folder-add-line size-4 text-text-secondary" />
<span className="system-sm-regular">
{t(($) => $['skillManagement.detail.createFolderMenu'])}
</span>
- </MenuItem>
- <MenuItem className="gap-2" onClick={onUploadFiles}>
+ </ActionItem>
+ <ActionItem className="gap-2" onClick={onUploadFiles}>
<span aria-hidden className="i-ri-upload-cloud-2-line size-4 text-text-secondary" />
<span className="system-sm-regular">
{t(($) => $['skillManagement.detail.uploadFilesMenu'])}
</span>
- </MenuItem>
+ </ActionItem>
</>
)
}
diff --git a/web/features/skills/detail/file-tree.tsx b/web/features/skills/detail/file-tree.tsx
index 29f791546b7..779f76aa418 100644
--- a/web/features/skills/detail/file-tree.tsx
+++ b/web/features/skills/detail/file-tree.tsx
@@ -44,12 +44,8 @@ import {
ContextMenuTrigger,
} from '@langgenius/dify-ui/context-menu'
import { DialogTrigger } from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Kbd, KbdGroup } from '@langgenius/dify-ui/kbd'
+import { Menu, MenuContent, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import {
ScrollArea,
@@ -1353,21 +1349,22 @@ export function FileTree({
{t(($) => $['skillManagement.detail.fileCount'], { count: fileCount })}
</h2>
{!readonly && (
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={tCommon(($) => $['operation.add'])}
className="flex size-8 shrink-0 cursor-pointer items-center justify-center rounded-lg text-text-secondary hover:bg-state-base-hover data-popup-open:bg-state-base-hover"
disabled={!detail || isMutating}
>
<span aria-hidden className="i-ri-add-line size-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent
+ </MenuTrigger>
+ <MenuContent
+ align="end"
data-skill-file-menu
onKeyDown={handleRootMenuKeyDown}
className={skillFileMenuPopupClassName}
>
<RootFileActionMenuItems
- kind="dropdown"
+ kind="menu"
onCreateFile={() =>
setInlineAction({
kind: 'create',
@@ -1382,8 +1379,8 @@ export function FileTree({
}
onUploadFiles={() => uploadInputRef.current?.click()}
/>
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
)}
<input
ref={uploadInputRef}
diff --git a/web/features/skills/detail/sidebar-actions.tsx b/web/features/skills/detail/sidebar-actions.tsx
index c4bf84b8c31..40bca8d0e17 100644
--- a/web/features/skills/detail/sidebar-actions.tsx
+++ b/web/features/skills/detail/sidebar-actions.tsx
@@ -13,15 +13,9 @@ import {
AlertDialogTitle,
} from '@langgenius/dify-ui/alert-dialog'
import { Button } from '@langgenius/dify-ui/button'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Field, FieldLabel } from '@langgenius/dify-ui/field'
import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react'
import { Trans, useTranslation } from 'react-i18next'
@@ -253,32 +247,32 @@ export function SkillDetailSidebarActions({
return (
<>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={t(($) => $['skillManagement.moreActions'], {
name: detail.display_name,
})}
className="mt-px flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
>
<span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-40">
+ </MenuTrigger>
+ <MenuContent align="end" className="w-40">
{canEdit && (
- <DropdownMenuItem className="gap-2" onClick={onRename}>
+ <MenuItem className="gap-2" onClick={onRename}>
<span aria-hidden className="i-ri-edit-line size-4 shrink-0 text-text-tertiary" />
<span>{tCommon(($) => $['operation.rename'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
{canEdit && (
- <DropdownMenuItem className="gap-2" onClick={handleDuplicate}>
+ <MenuItem className="gap-2" onClick={handleDuplicate}>
<span
aria-hidden
className="i-ri-file-copy-2-line size-4 shrink-0 text-text-tertiary"
/>
<span>{tCommon(($) => $['operation.duplicate'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- <DropdownMenuItem
+ <MenuItem
className="gap-2"
onClick={() => {
if (!exportMutation.isPending) exportMutation.mutate()
@@ -289,22 +283,18 @@ export function SkillDetailSidebarActions({
className="i-ri-file-download-line size-4 shrink-0 text-text-tertiary"
/>
<span>{tCommon(($) => $['operation.export'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
{canDelete && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem
- variant="destructive"
- className="gap-2"
- onClick={() => setDeleteOpen(true)}
- >
+ <MenuSeparator />
+ <MenuItem variant="destructive" className="gap-2" onClick={() => setDeleteOpen(true)}>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span>{tCommon(($) => $['operation.delete'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
<SkillDetailDeleteDialog detail={detail} open={deleteOpen} onOpenChange={setDeleteOpen} />
</>
)
diff --git a/web/features/skills/detail/version-panel.tsx b/web/features/skills/detail/version-panel.tsx
index 5d2da5c6704..754989e9477 100644
--- a/web/features/skills/detail/version-panel.tsx
+++ b/web/features/skills/detail/version-panel.tsx
@@ -25,15 +25,9 @@ import {
DialogHeaderCloseButton,
DialogTitle,
} from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Field, FieldLabel } from '@langgenius/dify-ui/field'
import { Input } from '@langgenius/dify-ui/input'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { Textarea } from '@langgenius/dify-ui/textarea'
import { useMutation, useQueryClient } from '@tanstack/react-query'
@@ -315,18 +309,18 @@ function VersionRow({
</span>
</span>
</button>
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
aria-label={tCommon(($) => $['operation.more'])}
className="absolute top-1 right-1 flex size-6 shrink-0 cursor-pointer items-center justify-center overflow-hidden rounded-md border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-1 opacity-0 shadow-xs group-hover:opacity-100 focus-visible:opacity-100 data-popup-open:opacity-100"
>
<span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
- </DropdownMenuTrigger>
- <DropdownMenuContent className="w-46">
- <DropdownMenuItem onClick={() => setRestoreOpen(true)}>
+ </MenuTrigger>
+ <MenuContent align="end" className="w-46">
+ <MenuItem onClick={() => setRestoreOpen(true)}>
{t(($) => $['skillManagement.detail.restoreVersion'])}
- </DropdownMenuItem>
- <DropdownMenuItem
+ </MenuItem>
+ <MenuItem
onClick={() => {
setVersionName(version.version_name)
setPublishNote(version.publish_note)
@@ -334,17 +328,17 @@ function VersionRow({
}}
>
{versionInfoLabel}
- </DropdownMenuItem>
+ </MenuItem>
{!version.is_latest && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem variant="destructive" onClick={() => setDeleteOpen(true)}>
+ <MenuSeparator />
+ <MenuItem variant="destructive" onClick={() => setDeleteOpen(true)}>
{tCommon(($) => $['operation.delete'])}
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
</li>
<Dialog open={renameOpen} onOpenChange={setRenameOpen}>
diff --git a/web/features/skills/page.tsx b/web/features/skills/page.tsx
index b712182b054..c4841c8770d 100644
--- a/web/features/skills/page.tsx
+++ b/web/features/skills/page.tsx
@@ -27,16 +27,10 @@ import {
DialogHeaderCloseButton,
DialogTitle,
} from '@langgenius/dify-ui/dialog'
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@langgenius/dify-ui/dropdown-menu'
import { Field, FieldLabel } from '@langgenius/dify-ui/field'
import { IconButton } from '@langgenius/dify-ui/icon-button'
import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
+import { Menu, MenuContent, MenuItem, MenuSeparator, MenuTrigger } from '@langgenius/dify-ui/menu'
import {
ScrollArea,
ScrollAreaContent,
@@ -535,8 +529,8 @@ function SkillCard({
)}
<div className="pointer-events-none absolute inset-e-[-0.5px] top-[-0.5px] flex h-16 w-30 items-start justify-end bg-[linear-gradient(67deg,var(--color-components-card-bg-alt-transparent)_0%,var(--color-components-card-bg-alt)_75%)] p-2 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100 has-data-popup-open:opacity-100 rtl:bg-[linear-gradient(293deg,var(--color-components-card-bg-alt-transparent)_0%,var(--color-components-card-bg-alt)_75%)] [@media(hover:none)]:opacity-100">
<div className="pointer-events-none flex items-center overflow-hidden rounded-[10px] border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg p-0.5 shadow-lg backdrop-blur-xs group-focus-within:pointer-events-auto group-hover:pointer-events-auto has-data-popup-open:pointer-events-auto [@media(hover:none)]:pointer-events-auto">
- <DropdownMenu modal={false}>
- <DropdownMenuTrigger
+ <Menu modal={false}>
+ <MenuTrigger
render={
<IconButton
aria-label={t(($) => $['skillManagement.moreActions'], {
@@ -549,17 +543,17 @@ function SkillCard({
</IconButton>
}
/>
- <DropdownMenuContent className="w-40">
+ <MenuContent align="end" className="w-40">
{canEdit && (
- <DropdownMenuItem className="gap-2" onClick={handleDuplicate}>
+ <MenuItem className="gap-2" onClick={handleDuplicate}>
<span
aria-hidden
className="i-ri-file-copy-line size-4 shrink-0 text-text-tertiary"
/>
<span>{tCommon(($) => $['operation.duplicate'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
)}
- <DropdownMenuItem
+ <MenuItem
className="gap-2"
disabled={exportMutation.isPending}
onClick={handleExport}
@@ -569,22 +563,22 @@ function SkillCard({
className="i-ri-download-2-line size-4 shrink-0 text-text-tertiary"
/>
<span>{tCommon(($) => $['operation.export'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
{canDelete && (
<>
- <DropdownMenuSeparator />
- <DropdownMenuItem
+ <MenuSeparator />
+ <MenuItem
variant="destructive"
className="gap-2"
onClick={() => setIsDeleteOpen(true)}
>
<span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
<span>{tCommon(($) => $['operation.delete'])}</span>
- </DropdownMenuItem>
+ </MenuItem>
</>
)}
- </DropdownMenuContent>
- </DropdownMenu>
+ </MenuContent>
+ </Menu>
</div>
</div>
<div className="pointer-events-none absolute top-26 right-3 left-3 flex h-6.5 min-w-0 items-start">