From 2b513b5ae7e33354f8f3d1044a91ce3534822732 Mon Sep 17 00:00:00 2001 From: braks <78412429+bcakmakoglu@users.noreply.github.com> Date: Sun, 25 Dec 2022 11:32:15 +0100 Subject: [PATCH] refactor(core,nodes): remove `snapGrid` option from nodes - use global one instead Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com> --- packages/core/src/components/Nodes/NodeWrapper.vue | 3 --- packages/core/src/composables/useUpdateNodePositions.ts | 8 ++++---- packages/core/src/types/node.ts | 2 -- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/core/src/components/Nodes/NodeWrapper.vue b/packages/core/src/components/Nodes/NodeWrapper.vue index 4d34a1fa..0c189be4 100644 --- a/packages/core/src/components/Nodes/NodeWrapper.vue +++ b/packages/core/src/components/Nodes/NodeWrapper.vue @@ -10,7 +10,6 @@ const { id, type, name, draggable, selectable, connectable, ...props } = defineP selectable: boolean connectable: HandleConnectable focusable: boolean - snapGrid?: SnapGrid type: NodeComponent | Function | Object | false name: string node: GraphNode @@ -213,8 +212,6 @@ const onKeyDown = (event: KeyboardEvent) => { x: arrowKeyDiffs[event.key].x, y: arrowKeyDiffs[event.key].y, }, - !!props.snapGrid, - props.snapGrid, event.shiftKey, ) } diff --git a/packages/core/src/composables/useUpdateNodePositions.ts b/packages/core/src/composables/useUpdateNodePositions.ts index d300f282..220a622f 100644 --- a/packages/core/src/composables/useUpdateNodePositions.ts +++ b/packages/core/src/composables/useUpdateNodePositions.ts @@ -1,13 +1,13 @@ import type { NodeDragItem, SnapGrid, XYPosition } from '~/types' function useUpdateNodePositions() { - const { getSelectedNodes, nodeExtent, updateNodePositions, findNode } = useVueFlow() + const { getSelectedNodes, nodeExtent, updateNodePositions, findNode, snapGrid, snapToGrid } = useVueFlow() - return (positionDiff: XYPosition, snapToGrid: boolean, snapGrid: SnapGrid | undefined, isShiftPressed = false) => { + return (positionDiff: XYPosition, isShiftPressed = false) => { // by default a node moves 5px on each key press, or 20px if shift is pressed // if snap grid is enabled, we use that for the velocity. - const xVelo = snapToGrid && snapGrid ? snapGrid[0] : 5 - const yVelo = snapToGrid && snapGrid ? snapGrid[1] : 5 + const xVelo = snapToGrid.value ? snapGrid.value[0] : 5 + const yVelo = snapToGrid.value ? snapGrid.value[1] : 5 const factor = isShiftPressed ? 4 : 1 const positionDiffX = positionDiff.x * xVelo * factor diff --git a/packages/core/src/types/node.ts b/packages/core/src/types/node.ts index 554221be..772b185b 100644 --- a/packages/core/src/types/node.ts +++ b/packages/core/src/types/node.ts @@ -34,8 +34,6 @@ export interface Node