Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(workflow): restore node focus and standardize panel controls (#42410)
yyhb107d5abd479
diff --git a/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx b/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsxindex 92f1284f4ab..3ece71d143b 100644--- a/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx+++ b/web/app/components/workflow/__tests__/keyboard-node-movement.browser.spec.tsx@@ -44,22 +44,11 @@ const nodes = [},]const edges = [{ id: 'connection', source: 'node', target: 'output', type: 'straight' }]-function TestNode({ id, data }: NodeProps) {- const store = useStoreApi()+function TestNode({ data }: NodeProps) {return (<div style={{ width: 200, height: 100 }}><Handle type="target" position={Position.Left} />- <button- type="button"- aria-label={`Select ${data.title}`}- data-node-keyboard-target- onClick={() => {- const { getNodes, setNodes } = store.getState()- setNodes(getNodes().map((node) => ({ ...node, selected: node.id === id })))- }}- >- {data.title}- </button>+ <span>{data.title}</span><textarea className="nodrag" aria-label={`${data.title} editor`} /><Handle type="source" position={Position.Right} /></div>@@ -126,12 +115,10 @@ it('moves a Tab-focused node without selecting it first, at canvas scale withoutexpect(edge.element().getBoundingClientRect().y).toBe(initialEdge.y + 10)await expect.element(node).toHaveFocus()await userEvent.tab()- await userEvent.tab()await expect.element(screen.getByRole('textbox', { name: 'Code editor' })).toHaveFocus()await userEvent.keyboard('{ArrowRight}')expect(node.element().getBoundingClientRect().x).toBe(initial.x + 2.5)await userEvent.tab({ shift: true })- await userEvent.tab({ shift: true })await userEvent.keyboard('{Escape}{ArrowRight}')await expect.poll(() => node.element().getBoundingClientRect().x).toBe(initial.x + 5)})@@ -143,9 +130,8 @@ it('keeps a connected edge attached when a click-selected node moves with the keconst node = screen.getByRole('button', { name: 'Code', exact: true })const edge = screen.getByRole('img', { name: 'Edge from node to output' })await expect.element(edge).toBeVisible()- const header = screen.getByRole('button', { name: 'Select Code' })- await header.click()- await expect.element(header).toHaveFocus()+ await screen.getByText('Code', { exact: true }).click()+ await expect.element(node).toHaveFocus()const initialNode = node.element().getBoundingClientRect()const initialEdge = edge.element().getBoundingClientRect()@@ -158,5 +144,5 @@ it('keeps a connected edge attached when a click-selected node moves with the keawait expect.poll(() => node.element().getBoundingClientRect().x).toBe(initialNode.x - 7.5)expect(edge.element().getBoundingClientRect().x).toBe(initialEdge.x - 7.5)expect(edge.element().getBoundingClientRect().right).toBe(initialEdge.right)- await expect.element(header).toHaveFocus()+ await expect.element(node).toHaveFocus()})diff --git a/web/app/components/workflow/block-selector/__tests__/index.spec.tsx b/web/app/components/workflow/block-selector/__tests__/index.spec.tsxindex 8c3fea6a174..65673beaebf 100644--- a/web/app/components/workflow/block-selector/__tests__/index.spec.tsx+++ b/web/app/components/workflow/block-selector/__tests__/index.spec.tsx@@ -205,7 +205,10 @@ describe('BlockSelector', () => {await user.type(searchInput, 'webhook')await user.click(screen.getByRole('button', { name: 'selector-open' }))- expect(onOpenChange).toHaveBeenCalledWith(false)+ expect(onOpenChange).toHaveBeenCalledWith(+ false,+ expect.objectContaining({ reason: 'trigger-press' }),+ )expect(screen.getByRole('tab', { name: 'workflow.tabs.start' })).toHaveAttribute('aria-selected','true',diff --git a/web/app/components/workflow/block-selector/index.tsx b/web/app/components/workflow/block-selector/index.tsxindex 286f5882b72..3a91e2926ac 100644--- a/web/app/components/workflow/block-selector/index.tsx+++ b/web/app/components/workflow/block-selector/index.tsx@@ -1,5 +1,10 @@-import type { PopoverPositionerProps, PopoverTriggerProps } from '@langgenius/dify-ui/popover'-import type { CSSProperties, KeyboardEvent, MouseEventHandler } from 'react'+import type {+ PopoverPopupProps,+ PopoverPositionerProps,+ PopoverProps,+ PopoverTriggerProps,+} from '@langgenius/dify-ui/popover'+import type { CSSProperties, KeyboardEvent, MouseEventHandler, Ref } from 'react'import type {CommonNodeType,NodeDefault,@@ -34,8 +39,13 @@ export type BlockSelectorProps = Pick<PopoverPositionerProps,'alignOffset' | 'placement' | 'sideOffset'> & {+ finalFocus?: PopoverPopupProps['finalFocus']+ triggerRef?: Ref<HTMLButtonElement>open?: boolean- onOpenChange?: (open: boolean) => void+ onOpenChange?: (+ open: boolean,+ details?: Parameters<NonNullable<PopoverProps['onOpenChange']>>[1],+ ) => voidonSelect: OnSelectBlocktrigger?: NonNullable<PopoverTriggerProps['render']>triggerTooltip?: string@@ -64,6 +74,8 @@ function BlockSelector({onSelect,trigger,triggerTooltip,+ triggerRef,+ finalFocus,placement = 'right',sideOffset,alignOffset,@@ -91,11 +103,11 @@ function BlockSelector({const searchInputRef = useRef<HTMLInputElement>(null)const open = openFromProps === undefined ? localOpen : openFromPropsconst handleOpenChange = useCallback(- (newOpen: boolean) => {+ (newOpen: boolean, details?: Parameters<NonNullable<PopoverProps['onOpenChange']>>[1]) => {if (newOpen && disabled) returnsetLocalOpen(newOpen)- if (onOpenChange) onOpenChange(newOpen)+ if (onOpenChange) onOpenChange(newOpen, details)},[disabled, onOpenChange],)@@ -125,6 +137,7 @@ function BlockSelector({const triggerControl = trigger ? (<PopoverTrigger+ ref={triggerRef}aria-label={triggerAriaLabel}disabled={disabled}render={trigger}@@ -132,6 +145,7 @@ function BlockSelector({/>) : (<PopoverTrigger+ ref={triggerRef}disabled={disabled}render={<IconButton@@ -165,6 +179,7 @@ function BlockSelector({><PopoverPopupinitialFocus={searchInputRef}+ finalFocus={finalFocus}className="border-none bg-transparent shadow-none"onClick={handlePopupClick}onKeyDown={isolateKeyboardEvents ? handlePopupKeyDown : undefined}diff --git a/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx b/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsxindex 0fb4073eefb..b4f4afed772 100644--- a/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx+++ b/web/app/components/workflow/hooks/__tests__/use-node-keyboard-interactions.spec.tsx@@ -34,7 +34,7 @@ function Canvas() {<div onKeyDownCapture={onKeyDownCapture}><div role="button" tabIndex={0} className="react-flow__node" data-id="node">Node- <button type="button" data-node-keyboard-target onClick={() => state.select('node')}>+ <button type="button" onClick={() => state.select('node')}>Select node</button></div>@@ -83,16 +83,32 @@ describe('node keyboard interactions', () => {const user = userEvent.setup()renderWorkflowComponent(<Canvas />)await user.tab()- await user.keyboard('{Enter}{Escape}')+ await user.keyboard('{Enter}{Escape} ')expect(state.select.mock.calls).toEqual([['node', false],['node', true],+ ['node', false],])await user.click(screen.getByRole('textbox', { name: 'Node title' }))await user.keyboard('{ArrowDown}')expect(state.sync).not.toHaveBeenCalled()})+ it('allows readonly nodes to be selected and inspected without allowing movement', async () => {+ state.readonly = true+ const user = userEvent.setup()+ renderWorkflowComponent(<Canvas />)+ await user.tab()+ await user.keyboard('{Enter}{Escape} {ArrowRight}')+ expect(state.select.mock.calls).toEqual([+ ['node', false],+ ['node', true],+ ['node', false],+ ])+ expect(rfState.nodes[0]!.position).toEqual({ x: 0, y: 0 })+ expect(state.sync).not.toHaveBeenCalled()+ })+it('moves a Tab-focused unselected node without moving a separate selection', async () => {rfState.nodes = [createNode({ id: 'node', selected: false, position: { x: 0, y: 0 } }),@@ -110,20 +126,14 @@ describe('node keyboard interactions', () => {expect(state.history).toHaveBeenCalledWith('NodeDragStop', { nodeId: 'node' })})- it('moves from the title button through collaboration and keeps its native activation', async () => {+ it('leaves independent node button keys to that button', async () => {const user = userEvent.setup()renderWorkflowComponent(<Canvas />)await user.click(screen.getByRole('button', { name: 'Select node' }))- await user.keyboard('{ArrowRight}')- expect(rfState.nodes[0]!.position).toEqual({ x: 5, y: 0 })- expect(collaborationManager.setNodes).toHaveBeenCalledWith(- expect.arrayContaining([expect.objectContaining({ position: { x: 0, y: 0 } })]),- expect.arrayContaining([expect.objectContaining({ position: { x: 5, y: 0 } })]),- 'keyboard-node-movement',- )- expect(state.sync).toHaveBeenCalledOnce()state.select.mockClear()- await user.keyboard('{Enter} ')+ await user.keyboard('{ArrowRight}{Enter} ')+ expect(rfState.nodes[0]!.position).toEqual({ x: 0, y: 0 })+ expect(state.sync).not.toHaveBeenCalled()expect(state.select.mock.calls).toEqual([['node'], ['node']])})diff --git a/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts b/web/app/components/workflow/hooks/use-node-keyboard-interactions.tsindex cd09cb11b07..e7cd5815688 100644--- a/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts+++ b/web/app/components/workflow/hooks/use-node-keyboard-interactions.ts@@ -26,13 +26,9 @@ export function useNodeKeyboardInteractions(onSelect: (id: string, cancel?: boolreturn (event: KeyboardEvent<HTMLDivElement>) => {const target = event.targetif (!(target instanceof HTMLElement)) return- const isNodeTitle = target.hasAttribute('data-node-keyboard-target')- const nodeTarget = isNodeTitle ? target.closest<HTMLElement>('.react-flow__node') : target- const isNode = nodeTarget?.classList.contains('react-flow__node')+ const isNode = target.classList.contains('react-flow__node')const isSelection = target.classList.contains('react-flow__nodesselection-rect')if (!isNode && !isSelection) return- // The title button owns its normal click activation.- if (isNodeTitle && (event.key === 'Enter' || event.key === ' ')) returnconst movement = getKeyboardMovement(event)const isMovementKey = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(event.key)const isSelectionKey = ['Enter', ' ', 'Escape'].includes(event.key)@@ -43,11 +39,9 @@ export function useNodeKeyboardInteractions(onSelect: (id: string, cancel?: boolevent.preventDefault()event.stopPropagation()if (event.altKey || event.ctrlKey || event.metaKey) return- if (getNodesReadOnly() || workflowStore.getState().controlMode === ControlMode.Comment) return+ if (workflowStore.getState().controlMode === ControlMode.Comment) returnconst { nodes, setNodes } = workflow.getState()- const focusedNode = isNode- ? nodes.find((node) => node.id === nodeTarget?.dataset.id)- : undefined+ const focusedNode = isNode ? nodes.find((node) => node.id === target.dataset.id) : undefinedif (isNode && !focusedNode) returnif (focusedNode &&@@ -61,7 +55,7 @@ export function useNodeKeyboardInteractions(onSelect: (id: string, cancel?: boolif (focusedNode) onSelect(focusedNode.id, event.key === 'Escape')return}- if (!movement) return+ if (getNodesReadOnly() || !movement) returnif (!collaborationManager.canApplyLocalGraphMutation()) returnconst movingIds = new Set(diff --git a/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsxindex b046d0f078e..64518067cf4 100644--- a/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx+++ b/web/app/components/workflow/nodes/_base/__tests__/node.spec.tsx@@ -1,8 +1,8 @@import type { PropsWithChildren } from 'react'import type { CommonNodeType } from '@/app/components/workflow/types'-import { fireEvent, screen } from '@testing-library/react'+import { screen } from '@testing-library/react'import { renderWorkflowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'-import { BlockEnum, ControlMode, NodeRunningStatus } from '@/app/components/workflow/types'+import { BlockEnum, NodeRunningStatus } from '@/app/components/workflow/types'import BaseNode from '../node'const mockHasNodeInspectVars = vi.fn()@@ -95,10 +95,6 @@ vi.mock('@/app/components/workflow/block-icon', () => ({vi.mock('@/app/components/workflow/nodes/tool/components/copy-id', () => ({default: ({ content }: { content: string }) => <div>{content}</div>,}))-vi.mock('@/app/components/workflow/utils/node-navigation', () => ({- selectWorkflowNode: vi.fn(),-}))-const createData = (overrides: Record<string, unknown> = {}) => ({type: BlockEnum.Tool,title: 'Node title',@@ -144,40 +140,32 @@ describe('BaseNode', () => {expect(screen.getByTestId('node-target-handle')).toBeInTheDocument()})- it('should expose the node title area as a selectable button', async () => {- const { selectWorkflowNode } = await import('@/app/components/workflow/utils/node-navigation')-+ it('places node actions before both add-node handles in DOM order', () => {renderWorkflowComponent(<BaseNode id="node-1" data={toNodeData(createData())}><div>Body</div></BaseNode>,)-- const node = screen.getByRole('button', { name: 'Node title' })-- fireEvent.click(node)-- expect(selectWorkflowNode).toHaveBeenCalledWith('node-1')+ const actions = screen.getByTestId('node-control')+ for (const handle of ['node-target-handle', 'node-source-handle']) {+ expect(+ actions.compareDocumentPosition(screen.getByTestId(handle)) &+ Node.DOCUMENT_POSITION_FOLLOWING,+ ).toBeTruthy()+ }})- it('should not select the node from the title button while in comment mode', async () => {- const { selectWorkflowNode } = await import('@/app/components/workflow/utils/node-navigation')-+ it('renders the title as text without an additional button', () => {renderWorkflowComponent(<BaseNode id="node-1" data={toNodeData(createData())}><div>Body</div></BaseNode>,- { initialStoreState: { controlMode: ControlMode.Comment } },)-- const node = screen.getByRole('button', { name: 'Node title' })-- fireEvent.click(node)-- expect(selectWorkflowNode).not.toHaveBeenCalled()+ expect(screen.getByText('Node title')).toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Node title' })).not.toBeInTheDocument()})- it('should keep header metadata outside the selectable button', () => {+ it('should retain the independent header metadata control', () => {renderWorkflowComponent(<BaseNodeid="node-1"@@ -192,13 +180,11 @@ describe('BaseNode', () => {</BaseNode>,)- const titleButton = screen.getByRole('button', { name: 'Node title' })const parallelButton = screen.getByRole('button', {name: /workflow\.nodes\.iteration\.parallelModeUpper/,})- expect(titleButton).not.toContainElement(parallelButton)- expect(titleButton.querySelector('button')).toBeNull()+ expect(parallelButton).toBeInTheDocument()})it('should render entry nodes inside the entry container', () => {diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsxnew file mode 100644index 00000000000..d3e7516b461--- /dev/null+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-focus.browser.spec.tsx@@ -0,0 +1,181 @@+import type { NodeProps } from 'reactflow'+import type { CommonNodeType } from '../../../../types'+import ReactFlow from 'reactflow'+import { page, userEvent } from 'vite-plus/test/browser'+import { render } from 'vitest-browser-react'+import { BlockEnum } from '../../../../types'+import NodeControl from '../node-control'+import { NodeSourceHandle, NodeTargetHandle } from '../node-handle'+import 'reactflow/dist/style.css'++// Plugin installation is outside node trigger and popup focus ownership.+vi.mock('@/app/components/plugins/install-plugin/install-from-marketplace', () => ({+ default: () => null,+}))++vi.mock('../../../../hooks/use-available-blocks', () => ({+ useAvailableBlocks: () => ({+ availablePrevBlocks: [BlockEnum.Code],+ availableNextBlocks: [BlockEnum.Code],+ }),+}))+vi.mock('../../../../hooks/use-nodes-interactions', () => ({+ useNodesInteractions: () => ({ handleNodeAdd: vi.fn(), handleNodeSelect: vi.fn() }),+}))+vi.mock('../../../../hooks/use-workflow', () => ({+ useIsChatMode: () => false,+ useNodesReadOnly: () => ({ nodesReadOnly: false, getNodesReadOnly: () => false }),+}))+vi.mock('../../../../hooks/use-nodes-meta-data', () => ({+ useNodeMetaData: () => ({+ isTypeFixed: true,+ isUndeletable: false,+ isSingleton: false,+ description: 'Code',+ author: 'Dify',+ }),+}))+vi.mock('@/app/components/workflow/store', () => ({+ useStore: (selector: (state: Record<string, unknown>) => unknown) =>+ selector({ nodes: [], dataSourceList: [], shouldAutoOpenStartNodeSelector: false }),+ useWorkflowStore: () => ({ getState: () => ({}) }),+}))+vi.mock('@/app/components/workflow/hooks-store', () => ({+ useHooksStore: (selector: (state: Record<string, unknown>) => unknown) =>+ selector({+ configsMap: { flowType: 'app-flow' },+ availableNodesMetaData: { nodes: [] },+ accessControl: { canRun: false },+ }),+}))+vi.mock('@/service/use-plugins', () => ({+ useInvalidateCheckInstalled: () => vi.fn(),+ useFeaturedToolsRecommendations: () => ({ plugins: [], isLoading: false }),+ useFeaturedTriggersRecommendations: () => ({ plugins: [], isLoading: false }),+}))++vi.mock('@/service/use-triggers', () => ({+ useAllTriggerPlugins: () => ({ data: [] }),+ useInvalidateAllTriggerPlugins: () => vi.fn(),+}))++vi.mock('@/service/use-tools', () => ({+ useRAGRecommendedPlugins: () => ({ data: [] }),+ useInvalidateAllToolProviders: () => vi.fn(),+ useAllBuiltInTools: () => ({ data: [] }),+ useAllCustomTools: () => ({ data: [] }),+ useAllWorkflowTools: () => ({ data: [] }),+ useAllMCPTools: () => ({ data: [] }),+ useInvalidateAllBuiltInTools: () => vi.fn(),+}))++vi.mock('@/app/components/plugins/marketplace/query', () => ({+ useMarketplacePlugins: () => ({ data: undefined }),+}))++function FocusNode({ id, data }: NodeProps<CommonNodeType>) {+ return (+ <div className="group relative h-24 w-60 bg-components-panel-bg">+ <NodeControl id={id} data={data} />+ <NodeSourceHandle id={id} data={data} handleId="source" />+ <NodeTargetHandle id={id} data={data} handleId="target" />+ <span>Code node</span>+ </div>+ )+}+const nodeTypes = { focus: FocusNode }+async function renderCanvas() {+ await page.viewport(1000, 800)+ return render(+ <>+ <button type="button">Before canvas</button>++ <div style={{ width: 800, height: 600 }}>+ <ReactFlow+ defaultNodes={[+ {+ id: 'node',+ type: 'focus',+ ariaLabel: 'Code node',+ position: { x: 150, y: 150 },+ data: { type: BlockEnum.Code, title: 'Code', desc: '', selected: false },+ },+ ]}+ nodeTypes={nodeTypes}+ />+ </div>+ <input aria-label="Outside editor" />+ </>,+ )+}++it.each([0, 1])(+ 'restores focus to the visible handle button after a pointer-opened popup closes (%s)',+ async (index) => {+ const screen = await renderCanvas()+ const before = screen.getByRole('button', { name: 'Before canvas' })+ const node = screen.getByRole('button', { name: 'Code node', exact: true })+ const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' }).nth(index)+ await before.click()+ await userEvent.tab()+ await expect.element(node).toHaveFocus()+ // Click the real React Flow handle: its transparent button intentionally does not receive pointer events.+ await userEvent.click(trigger.element().parentElement!)+ await expect.element(screen.getByRole('dialog')).toBeVisible()+ await screen.getByRole('dialog').hover()+ await userEvent.keyboard('{Escape}')+ await expect.element(trigger).toHaveFocus()+ await expect.poll(() => trigger.element().checkVisibility({ checkOpacity: true })).toBe(true)+ await userEvent.keyboard('{Enter}')+ await expect.element(screen.getByRole('dialog')).toBeVisible()+ await userEvent.keyboard('{Escape}')+ await expect.element(trigger).toHaveFocus()+ },+)++it('reveals an unselected node handle when reached by Tab', async () => {+ const screen = await renderCanvas()+ const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' }).first()+ await screen.getByRole('button', { name: 'Before canvas' }).click()+ expect(trigger.element().checkVisibility({ checkOpacity: true })).toBe(false)+ await userEvent.tab()+ await userEvent.tab()+ await expect.element(screen.getByRole('button', { name: 'common.operation.more' })).toHaveFocus()+ await userEvent.tab()+ await expect.element(trigger).toHaveFocus()+ await expect.poll(() => trigger.element().checkVisibility({ checkOpacity: true })).toBe(true)+})++it('keeps More visible and focused after closing an unselected node menu away from hover', async () => {+ const screen = await renderCanvas()+ const before = screen.getByRole('button', { name: 'Before canvas' })+ const more = screen.getByRole('button', { name: 'common.operation.more' })+ await before.click()+ expect(more.element().checkVisibility({ checkOpacity: true })).toBe(false)+ await screen.getByRole('button', { name: 'Code node', exact: true }).hover()+ await more.click()+ await expect.element(screen.getByRole('menu')).toBeVisible()+ await before.hover()+ await userEvent.keyboard('{Escape}')+ await expect.element(more).toHaveFocus()+ expect(more.element().checkVisibility({ checkOpacity: true })).toBe(true)+ await userEvent.keyboard('{Enter}')+ await expect.element(screen.getByRole('menu')).toBeVisible()+})++it.each([0, 1])(+ 'preserves an outside input focus after dismissing handle popup (%s)',+ async (index) => {+ const screen = await renderCanvas()+ const trigger = screen.getByRole('button', { name: 'workflow.common.addBlock' }).nth(index)+ const editor = screen.getByRole('textbox', { name: 'Outside editor' })+ const input = editor.element()+ await userEvent.click(trigger.element().parentElement!)+ await expect.element(screen.getByRole('dialog')).toBeVisible()+ await userEvent.click(input)+ await expect.element(screen.getByRole('dialog')).not.toBeInTheDocument()+ await expect.element(editor).toHaveFocus()+ await userEvent.keyboard('Node title')+ await expect.element(editor).toHaveValue('Node title')+ },+)diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsxindex 4f08d3b2c6d..22d2ce4a055 100644--- a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.browser.spec.tsx@@ -229,6 +229,7 @@ it.each([1, 0.5, 0.25])(await expect.element(screen.getByLabelText('Connection')).toHaveTextContent('source:out → target:in')+ await expect.element(screen.getByRole('dialog')).not.toBeInTheDocument()},)diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsxindex b659664ddfb..57c7ff0c34b 100644--- a/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx+++ b/web/app/components/workflow/nodes/_base/components/__tests__/node-handle.spec.tsx@@ -1,6 +1,6 @@import type { ReactNode } from 'react'import type { CommonNodeType } from '@/app/components/workflow/types'-import { fireEvent, render, screen } from '@testing-library/react'+import { fireEvent, render, screen, waitFor } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { BlockEnum } from '@/app/components/workflow/types'import { NodeSourceHandle, NodeTargetHandle } from '../node-handle'@@ -314,6 +314,20 @@ describe('node-handle', () => {// Auto-open tests cover workflow start-trigger variants, chat-mode bypass, and store fallback paths.describe('NodeSourceHandle auto-open', () => {+ it('restores the previous focus when the start selector opens automatically', async () => {+ const user = userEvent.setup()+ render(<button type="button">Previous action</button>)+ const previousAction = screen.getByRole('button', { name: 'Previous action' })+ await user.click(previousAction)+ mockStoreState.shouldAutoOpenStartNodeSelector = true++ renderSourceHandle({ type: BlockEnum.Start })+ await screen.findByRole('dialog')+ await user.keyboard('{Escape}')++ await waitFor(() => expect(previousAction).toHaveFocus())+ })+it.each([BlockEnum.Start,BlockEnum.TriggerSchedule,diff --git a/web/app/components/workflow/nodes/_base/components/help-link.tsx b/web/app/components/workflow/nodes/_base/components/help-link.tsxindex 55c8b45e628..429cc078544 100644--- a/web/app/components/workflow/nodes/_base/components/help-link.tsx+++ b/web/app/components/workflow/nodes/_base/components/help-link.tsx@@ -1,4 +1,6 @@import type { BlockEnum } from '@/app/components/workflow/types'+import { buttonVariants } from '@langgenius/dify-ui/button'+import { cn } from '@langgenius/dify-ui/cn'import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'import { memo } from 'react'import { useTranslation } from 'react-i18next'@@ -24,9 +26,12 @@ const HelpLink = ({ nodeType }: HelpLinkProps) => {href={link}target="_blank"rel="noopener noreferrer"- className="mr-1 flex size-6 items-center justify-center rounded-md hover:bg-state-base-hover"+ className={cn(+ buttonVariants({ variant: 'ghost', size: 'small' }),+ 'mr-1 w-6 p-0 text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',+ )}>- <span aria-hidden className="i-ri-book-open-line size-4 text-gray-500" />+ <span aria-hidden className="i-ri-book-open-line size-4" /></a>}/>diff --git a/web/app/components/workflow/nodes/_base/components/node-control.tsx b/web/app/components/workflow/nodes/_base/components/node-control.tsxindex 882c6286e16..856d9c11c4b 100644--- a/web/app/components/workflow/nodes/_base/components/node-control.tsx+++ b/web/app/components/workflow/nodes/_base/components/node-control.tsx@@ -27,10 +27,11 @@ const NodeControl: FC<NodeControlProps> = ({ id, data, pluginInstallLocked }) =>return (<divclassName={cn(- 'invisible absolute -top-8 right-0 flex h-8 origin-bottom-right pb-1',- !pluginInstallLocked && 'group-hover:visible',- data.selected && 'visible',- 'has-data-popup-open:visible',+ 'pointer-events-none absolute -top-8 right-0 flex h-8 origin-bottom-right pb-1 opacity-0',+ 'focus-within:pointer-events-auto focus-within:opacity-100',+ !pluginInstallLocked && 'group-hover:pointer-events-auto group-hover:opacity-100',+ data.selected && 'pointer-events-auto opacity-100',+ 'has-data-popup-open:pointer-events-auto has-data-popup-open:opacity-100',)}style={{ scale: 'var(--workflow-control-scale, 1)' }}>diff --git a/web/app/components/workflow/nodes/_base/components/node-handle.tsx b/web/app/components/workflow/nodes/_base/components/node-handle.tsxindex 9cd0842d5ec..aa0c5a3348f 100644--- a/web/app/components/workflow/nodes/_base/components/node-handle.tsx+++ b/web/app/components/workflow/nodes/_base/components/node-handle.tsx@@ -1,8 +1,9 @@import type { MouseEvent } from 'react'+import type { BlockSelectorProps } from '../../../block-selector'import type { BlockDefaultValue } from '../../../block-selector/types'import type { Node } from '../../../types'import { cn } from '@langgenius/dify-ui/cn'-import { memo, useCallback, useEffect, useState } from 'react'+import { memo, useCallback, useEffect, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { Handle, Position } from 'reactflow'import BlockSelector from '../../../block-selector'@@ -38,6 +39,8 @@ const canAutoOpenStartNodeSelector = (nodeType: BlockEnum, isChatMode: boolean)export const NodeTargetHandle = memo(({ id, data, handleId, handleClassName, nodeSelectorClassName }: NodeHandleProps) => {const [open, setOpen] = useState(false)+ const triggerRef = useRef<HTMLButtonElement>(null)+ const preserveOutsideFocusRef = useRef(false)const { handleNodeAdd } = useNodesInteractions()const { getNodesReadOnly } = useNodesReadOnly()const connected = data._connectedTargetHandleIds?.includes(handleId)@@ -47,12 +50,18 @@ export const NodeTargetHandle = memo()const isConnectable = !!availablePrevBlocks.length- const handleOpenChange = useCallback((v: boolean) => {- setOpen(v)- }, [])+ const handleOpenChange = useCallback<NonNullable<BlockSelectorProps['onOpenChange']>>(+ (v, details) => {+ preserveOutsideFocusRef.current =+ details?.reason === 'outside-press' || details?.reason === 'focus-out'+ setOpen(v)+ },+ [],+ )const handleHandleClick = useCallback((e: MouseEvent) => {e.stopPropagation()+ preserveOutsideFocusRef.current = falseif (!connected) setOpen((v) => !v)},[connected],@@ -102,6 +111,8 @@ export const NodeTargetHandle = memo(>{!connected && isConnectable && !getNodesReadOnly() && (<BlockSelector+ triggerRef={triggerRef}+ finalFocus={() => (preserveOutsideFocusRef.current ? false : triggerRef.current)}open={open}onOpenChange={handleOpenChange}onSelect={handleSelect}@@ -115,7 +126,7 @@ export const NodeTargetHandle = memo(triggerClassName={`absolute -left-1 -top-1 opacity-0 pointer-events-none transition-opacity duration-150${nodeSelectorClassName}- group-hover:opacity-100 focus-visible:opacity-100+ group-hover:opacity-100 focus:opacity-100${data.selected && 'opacity-100'}data-popup-open:opacity-100`}@@ -154,6 +165,10 @@ export const NodeSourceHandle = memo(const shouldAutoOpen =shouldAutoOpenStartNodeSelector && canAutoOpenStartNodeSelector(data.type, isChatMode)const [open, setOpen] = useState(() => shouldAutoOpen)+ const triggerRef = useRef<HTMLButtonElement>(null)+ const preserveOutsideFocusRef = useRef(false)+ // Auto-open keeps the previous focus; a pointer click on the handle returns to its button.+ const openedFromHandleRef = useRef(false)const connected = data._connectedSourceHandleIds?.includes(handleId)// Branch ports can be only 24px apart in canvas coordinates. Keep their@@ -164,11 +179,18 @@ export const NodeSourceHandle = memo(data.type === BlockEnum.QuestionClassifier ||data.type === BlockEnum.HumanInput ||data.error_strategy === ErrorHandleTypeEnum.failBranch- const handleOpenChange = useCallback((v: boolean) => {- setOpen(v)- }, [])+ const handleOpenChange = useCallback<NonNullable<BlockSelectorProps['onOpenChange']>>(+ (v, details) => {+ preserveOutsideFocusRef.current =+ details?.reason === 'outside-press' || details?.reason === 'focus-out'+ setOpen(v)+ },+ [],+ )const handleHandleClick = useCallback((e: MouseEvent) => {e.stopPropagation()+ preserveOutsideFocusRef.current = false+ openedFromHandleRef.current = truesetOpen((v) => !v)}, [])const handleSelect = useCallback(@@ -252,6 +274,11 @@ export const NodeSourceHandle = memo(</div>{isConnectable && !getNodesReadOnly() && (<BlockSelector+ triggerRef={triggerRef}+ finalFocus={() => {+ if (preserveOutsideFocusRef.current) return false+ return openedFromHandleRef.current ? triggerRef.current : true+ }}open={open}onOpenChange={handleOpenChange}onSelect={handleSelect}@@ -262,7 +289,7 @@ export const NodeSourceHandle = memo(triggerClassName={`absolute -top-1 -left-1 opacity-0 pointer-events-none transition-opacity duration-150${nodeSelectorClassName}- group-hover:opacity-100 focus-visible:opacity-100+ group-hover:opacity-100 focus:opacity-100${data.selected && 'opacity-100'}data-popup-open:opacity-100`}diff --git a/web/app/components/workflow/nodes/_base/components/title-description-input.tsx b/web/app/components/workflow/nodes/_base/components/title-description-input.tsxindex e82118927ff..33c58c99138 100644--- a/web/app/components/workflow/nodes/_base/components/title-description-input.tsx+++ b/web/app/components/workflow/nodes/_base/components/title-description-input.tsx@@ -76,7 +76,7 @@ export const DescriptionInput = memo(({ value, onChange }: DescriptionInputPropsreturn (<div>- <label htmlFor={inputId} className="mb-1 block system-xs-medium text-text-secondary">+ <label htmlFor={inputId} className="mx-2 mb-1 block system-xs-medium text-text-secondary">{t(($) => $['common.nodeDescription'], { ns: 'workflow' })}</label><divdiff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsxindex 0364408ebba..ae643ed35a0 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@@ -2,6 +2,7 @@ import type { CSSProperties, FC, ReactNode } from 'react'import type { SimpleSubscription } from '@/app/components/plugins/plugin-detail-panel/subscription-list'import type { Node } from '@/app/components/workflow/types'import { cn } from '@langgenius/dify-ui/cn'+import { IconButton } from '@langgenius/dify-ui/icon-button'import { Tabs, TabsList, TabsPanel, TabsTab } from '@langgenius/dify-ui/tabs'import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'import { RiCloseLine, RiPlayLargeLine } from '@remixicon/react'@@ -604,21 +605,20 @@ const BasePanel: FC<BasePanelProps> = ({ id, data, children }) => {<Tooltip disabled={isSingleRunning}><TooltipTriggerrender={- <button- type="button"+ <IconButtonaria-label={singleRunActionLabel}- className="mr-1 flex size-6 cursor-pointer items-center justify-center rounded-md border-0 bg-transparent p-0 hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden"+ className="mr-1"onClick={() => {if (isSingleRunning) handleStop()else handleSingleRun()}}>{isSingleRunning ? (- <Stop aria-hidden className="size-4 text-text-tertiary" />+ <Stop aria-hidden className="size-4" />) : (- <RiPlayLargeLine aria-hidden className="size-4 text-text-tertiary" />+ <RiPlayLargeLine aria-hidden className="size-4" />)}- </button>+ </IconButton>}/><TooltipContent className="mr-1">{runThisStepLabel}</TooltipContent>@@ -627,14 +627,12 @@ const BasePanel: FC<BasePanelProps> = ({ id, data, children }) => {<HelpLink nodeType={nodeMetaType} /><NodeActionsDropdown id={id} data={data} showHelpLink={false} /><div className="mx-3 h-3.5 w-px bg-divider-regular" />- <button- type="button"+ <IconButtonaria-label={t(($) => $['operation.close'], { ns: 'common' })}- className="flex size-6 cursor-pointer items-center justify-center rounded-md hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden"onClick={() => handleNodeSelect(id, true)}>- <RiCloseLine aria-hidden className="size-4 text-text-tertiary" />- </button>+ <RiCloseLine aria-hidden className="size-4" />+ </IconButton></div></div>{isStartPlaceholderPanel ? (diff --git a/web/app/components/workflow/nodes/_base/node.tsx b/web/app/components/workflow/nodes/_base/node.tsxindex c5d23dfdaba..c73f3a5453d 100644--- a/web/app/components/workflow/nodes/_base/node.tsx+++ b/web/app/components/workflow/nodes/_base/node.tsx@@ -21,7 +21,6 @@ import useInspectVarsCrud from '../../hooks/use-inspect-vars-crud'import { useNodePluginInstallation } from '../../hooks/use-node-plugin-installation'import { useToolIcon } from '../../hooks/use-tool-icon'import { useNodesReadOnly } from '../../hooks/use-workflow'-import { selectWorkflowNode } from '../../utils/node-navigation'import AddVariablePopupWithPosition from './components/add-variable-popup-with-position'import EntryNodeContainer, { StartNodeTypeEnum } from './components/entry-node-container'import ErrorHandleOnNode from './components/error-handle/error-handle-on-node'@@ -213,6 +212,9 @@ const BaseNode: FC<BaseNodeProps> = ({ id, data, children }) => {{data._showAddVariablePopup && <AddVariablePopupWithPosition nodeId={id} nodeData={data} />}{data.type === BlockEnum.Iteration && <NodeResizer nodeId={id} nodeData={data} />}{data.type === BlockEnum.Loop && <NodeResizer nodeId={id} nodeData={data} />}+ {!data._runningStatus && !nodesReadOnly && !data._isCandidate && (+ <NodeControl id={id} data={data} pluginInstallLocked={pluginInstallLocked} />+ )}{data.type !== BlockEnum.StartPlaceholder && !data._isCandidate && (<NodeTargetHandleid={id}@@ -233,28 +235,13 @@ const BaseNode: FC<BaseNodeProps> = ({ id, data, children }) => {handleId="source"/>)}- {!data._runningStatus && !nodesReadOnly && !data._isCandidate && (- <NodeControl id={id} data={data} pluginInstallLocked={pluginInstallLocked} />- )}<divclassName={cn('flex items-center rounded-t-2xl px-3 pt-3 pb-2',isContainerNode(data.type) && 'bg-transparent',)}>- <button- type="button"- data-node-keyboard-target- aria-label={data.title}- className="mr-1 flex min-w-0 grow appearance-none items-center rounded-md border-0 bg-transparent p-0 text-left focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden"- onClick={() => {- // In comment mode, clicking a node should not open the node settings panel:- // the right-hand panel covers the canvas region where the comment is anchored.- // Mirrors the comment-mode guard in use-nodes-interactions' handleNodeClick.- if (controlMode === ControlMode.Comment) return- selectWorkflowNode(id)- }}- >+ <div className="mr-1 flex min-w-0 grow items-center"><BlockIcon className="mr-2 shrink-0" type={data.type} size="md" toolIcon={toolIcon} /><div className="flex min-w-0 grow items-center system-sm-semibold-uppercase text-text-primary"><div title={data.title} className="min-w-0 grow truncate">@@ -266,7 +253,7 @@ const BaseNode: FC<BaseNodeProps> = ({ id, data, children }) => {</div>)}</div>- </button>+ </div><div className="flex shrink-0 items-center"><NodeHeaderMetadata={data}