From 798faf1be4dae3ea29a39bd03799b795ff189386 Mon Sep 17 00:00:00 2001 From: Braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Sun, 9 Jun 2024 09:58:17 +0200 Subject: [PATCH] refactor(core): remove connectedEdges from node mouse events (#1464) * refactor(core): remove `connectedEdges` from node mouse events * chore(changeset): add --- .changeset/three-ants-impress.md | 5 ++++ .../core/src/components/Nodes/NodeWrapper.ts | 23 +++++++++---------- packages/core/src/types/hooks.ts | 4 +--- 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 .changeset/three-ants-impress.md diff --git a/.changeset/three-ants-impress.md b/.changeset/three-ants-impress.md new file mode 100644 index 00000000..a530d75f --- /dev/null +++ b/.changeset/three-ants-impress.md @@ -0,0 +1,5 @@ +--- +"@vue-flow/core": minor +--- + +Remove `connectedEdges` as arg from NodeMouseEvents diff --git a/packages/core/src/components/Nodes/NodeWrapper.ts b/packages/core/src/components/Nodes/NodeWrapper.ts index 663a42e1..1373c780 100644 --- a/packages/core/src/components/Nodes/NodeWrapper.ts +++ b/packages/core/src/components/Nodes/NodeWrapper.ts @@ -37,8 +37,6 @@ const NodeWrapper = defineComponent({ compatConfig: { MODE: 3 }, props: ['id', 'resizeObserver'], setup(props: Props) { - provide(NodeId, props.id) - const { id: vueFlowId, noPanClassName, @@ -64,16 +62,17 @@ const NodeWrapper = defineComponent({ nodesFocusable, } = useVueFlow() + const nodeElement = ref(null) + provide(NodeRef, nodeElement) + provide(NodeId, props.id) + const slots = inject(Slots) const instance = getCurrentInstance() const updateNodePositions = useUpdateNodePositions() - const { node, parentNode, connectedEdges } = useNode(props.id) - - const nodeElement = ref(null) - provide(NodeRef, nodeElement) + const { node, parentNode } = useNode(props.id) const isDraggable = toRef(() => (typeof node.draggable === 'undefined' ? nodesDraggable.value : node.draggable)) @@ -333,28 +332,28 @@ const NodeWrapper = defineComponent({ function onMouseEnter(event: MouseEvent) { if (!dragging?.value) { - emit.mouseEnter({ event, node, connectedEdges: connectedEdges.value }) + emit.mouseEnter({ event, node }) } } function onMouseMove(event: MouseEvent) { if (!dragging?.value) { - emit.mouseMove({ event, node, connectedEdges: connectedEdges.value }) + emit.mouseMove({ event, node }) } } function onMouseLeave(event: MouseEvent) { if (!dragging?.value) { - emit.mouseLeave({ event, node, connectedEdges: connectedEdges.value }) + emit.mouseLeave({ event, node }) } } function onContextMenu(event: MouseEvent) { - return emit.contextMenu({ event, node, connectedEdges: connectedEdges.value }) + return emit.contextMenu({ event, node }) } function onDoubleClick(event: MouseEvent) { - return emit.doubleClick({ event, node, connectedEdges: connectedEdges.value }) + return emit.doubleClick({ event, node }) } function onSelectNode(event: MouseEvent) { @@ -370,7 +369,7 @@ const NodeWrapper = defineComponent({ ) } - emit.click({ event, node, connectedEdges: connectedEdges.value }) + emit.click({ event, node }) } function onKeyDown(event: KeyboardEvent) { diff --git a/packages/core/src/types/hooks.ts b/packages/core/src/types/hooks.ts index 64181002..ba5091db 100644 --- a/packages/core/src/types/hooks.ts +++ b/packages/core/src/types/hooks.ts @@ -1,7 +1,6 @@ import type { EventHookOn, EventHookTrigger } from '@vueuse/core' import type { D3ZoomEvent } from 'd3-zoom' -import type { VueFlowError } from '../utils/errors' -import type { EventHookExtended } from '../utils/createExtendedEventHook' +import type { EventHookExtended, VueFlowError } from '../utils' import type { GraphEdge } from './edge' import type { GraphNode } from './node' import type { Connection, OnConnectStartParams } from './connection' @@ -14,7 +13,6 @@ export type MouseTouchEvent = MouseEvent | TouchEvent export interface NodeMouseEvent { event: MouseTouchEvent node: GraphNode - connectedEdges: GraphEdge[] } export interface NodeDragEvent {