From c7e4945cec8ba1a8495d04b16e20c5451c729eeb Mon Sep 17 00:00:00 2001 From: Dennis Collaris <d.collaris@me.com> Date: Tue, 12 Nov 2024 14:42:37 +0100 Subject: [PATCH] fix: close context menu on click, not move --- libs/shared/lib/querybuilder/panel/QueryBuilder.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx index a05df9ba2..ed7287ace 100644 --- a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx +++ b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx @@ -489,11 +489,12 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => { setContextMenuOpen({ open: true, node: node, position: { x: event.clientX, y: event.clientY } }); }; - const onMove = useCallback( + const onMouseDown = useCallback( (event: MouseEvent | TouchEvent, viewport: Viewport) => { if (contextMenuOpen.open) { setContextMenuOpen({ ...contextMenuOpen, open: false }); } + dispatch(resultSetFocus({ focusType: 'query' })) }, [contextMenuOpen], ); @@ -629,13 +630,12 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => { nodeTypes={nodeTypes} edgeTypes={edgeTypes} connectionLineComponent={ConnectionDragLine} - onMouseDownCapture={() => dispatch(resultSetFocus({ focusType: 'query' }))} + onMouseDownCapture={onMouseDown} // connectionMode={ConnectionMode.Loose} onInit={(reactFlowInstance) => { reactFlowInstanceRef.current = reactFlowInstance; onInit(reactFlowInstance); }} - onMove={onMove} onNodesChange={saveStateAuthorization.query.W ? onNodesChange : () => {}} onDragOver={saveStateAuthorization.query.W ? onDragOver : () => {}} onConnect={saveStateAuthorization.query.W ? onConnect : () => {}} -- GitLab