alighasami/vue-flow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(core): replace getNode with findNode

Browse Source 
Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
braks
2023-01-18 20:47:32 +01:00
committed by Braks
parent 73de601f79
commit 203b4815f8
8 changed files with 114 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/composables/useDrag.ts
+7 -7
View File
@@ -26,7 +26,7 @@ function useDrag(params: UseDragParams) {
noDragClassName,
nodes,
nodeExtent,
getNode,
findNode,
multiSelectionActive,
nodesSelectionActive,
selectNodesOnDrag,
@@ -47,7 +47,7 @@ function useDrag(params: UseDragParams) {
watch([() => disabled, () => el], () => {
if (el) {
const selection = select(el)
const node = id ? getNode(id) : undefined
const node = id ? findNode(id) : undefined
if (disabled) {
selection.on('.drag', null)
@@ -65,13 +65,13 @@ function useDrag(params: UseDragParams) {
}
const mousePos = getPointerPosition(event, snapToGrid ? snapGrid : undefined)
dragItems = getDragItems(nodes, mousePos, getNode, id)
dragItems = getDragItems(nodes, mousePos, findNode, id)
if (onStart && dragItems) {
const [currentNode, nodes] = getEventHandlerParams({
id,
dragItems,
getNode: $$(getNode),
findNode,
})
onStart(event.sourceEvent, currentNode, nodes)
}
@@ -98,7 +98,7 @@ function useDrag(params: UseDragParams) {
n,
nextPosition,
nodeExtent,
n.parentNode ? getNode(n.parentNode) : undefined,
n.parentNode ? findNode(n.parentNode) : undefined,
)
// we want to make sure that we only fire a change event when there is a changes
@@ -117,7 +117,7 @@ function useDrag(params: UseDragParams) {
const [currentNode, nodes] = getEventHandlerParams({
id,
dragItems,
getNode: $$(getNode),
findNode,
})
dragging.value = true
@@ -135,7 +135,7 @@ function useDrag(params: UseDragParams) {
const [currentNode, nodes] = getEventHandlerParams({
id,
dragItems,
getNode: $$(getNode),
findNode,
})
dragging.value = false
packages/core/src/composables/useHandle.ts
+12 -12
View File
@@ -1,6 +1,6 @@
import type { MaybeRef } from '@vueuse/core'
import { isFunction } from '@vueuse/core'
import type { Connection, Getters, GraphEdge, HandleType, ValidConnectionFunc, XYPosition } from '~/types'
import type { Actions, Connection, GraphEdge, HandleType, ValidConnectionFunc, XYPosition } from '~/types'
import { ConnectionMode } from '~/types'
interface Result {
@@ -30,7 +30,7 @@ export const checkElementBelowIsValid = (
isValidConnection: ValidConnectionFunc | undefined,
doc: Document,
edges: GraphEdge[],
getNode: Getters['getNode'],
findNode: Actions['findNode'],
) => {
const clientX = (event as TouchEvent).touches ? (event as TouchEvent).touches[0].clientX : (event as MouseEvent).clientX
const clientY = (event as TouchEvent).touches ? (event as TouchEvent).touches[0].clientY : (event as MouseEvent).clientY
@@ -73,7 +73,7 @@ export const checkElementBelowIsValid = (
result.isValid =
(isFunction(isValidConnection)
? isValidConnection(connection, { edges, sourceNode: getNode(sourceId)!, targetNode: getNode(targetId)! })
? isValidConnection(connection, { edges, sourceNode: findNode(sourceId)!, targetNode: findNode(targetId)! })
: elementBelowNodeId !== nodeId || elementBelowHandleId !== handleId) ||
!result.connection.target ||
!result.connection.source
@@ -113,7 +113,7 @@ export default function useHandle({
startConnection,
updateConnection,
endConnection,
getNode,
findNode,
vueFlowRef,
} = $(useVueFlow())
@@ -129,7 +129,7 @@ export default function useHandle({
let validConnectFunc = isValidConnection
const node = getNode(unref(nodeId))
const node = findNode(unref(nodeId))
if (node && (typeof node.connectable === 'undefined' ? nodesConnectable : node.connectable) === false) return
@@ -175,7 +175,7 @@ export default function useHandle({
validConnectFunc,
doc,
edges,
getNode,
findNode,
)
if (!isHoveringHandle) return resetRecentHandle(recentHoveredHandle)
@@ -199,7 +199,7 @@ export default function useHandle({
validConnectFunc,
doc,
edges,
getNode,
findNode,
)
const isOwnHandle = connection.source === connection.target
@@ -234,7 +234,7 @@ export default function useHandle({
let validConnectFunc = isValidConnection
const node = getNode(unref(nodeId))
const node = findNode(unref(nodeId))
if (node && (typeof node.connectable === 'undefined' ? nodesConnectable : node.connectable) === false) return
@@ -285,7 +285,7 @@ export default function useHandle({
validConnectFunc,
doc,
edges,
getNode,
findNode,
)
if (!isHoveringHandle) return resetRecentHandle(recentHoveredHandle)
@@ -309,7 +309,7 @@ export default function useHandle({
validConnectFunc,
doc,
edges,
getNode,
findNode,
)
const isOwnHandle = connection.source === connection.target
@@ -343,7 +343,7 @@ export default function useHandle({
} else {
let validConnectFunc: ValidConnectionFunc = isValidConnection ?? (() => true)
const node = getNode(unref(nodeId))
const node = findNode(unref(nodeId))
if (node && (typeof node.connectable === 'undefined' ? nodesConnectable : node.connectable) === false) return
@@ -362,7 +362,7 @@ export default function useHandle({
validConnectFunc,
doc,
edges,
getNode,
findNode,
)
const isOwnHandle = connection.source === connection.target