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

fix(core): pass handle dom node to valid handle result

Browse Source
This commit is contained in:
braks
2023-07-19 19:12:29 +02:00
committed by Braks
parent 4cd433fbec
commit 08f749ae30
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/utils/handle.ts
+5 -3
View File
@@ -132,7 +132,7 @@ export function getClosestHandle(
const hasValidHandle = closestHandles.some(({ validHandleResult }) => validHandleResult.isValid) const hasValidHandle = closestHandles.some(({ validHandleResult }) => validHandleResult.isValid)
const hasTargetHandle = closestHandles.some(({ handle }) => handle.type === 'target') const hasTargetHandle = closestHandles.some(({ handle }) => handle.type === 'target')
// if multiple handles are layouted on top of each other we prefer the one with type = target and the one that is valid // if multiple handles are layout on top of each other we prefer the one with type = target and the one that is valid
return ( return (
closestHandles.find(({ handle, validHandleResult }) => closestHandles.find(({ handle, validHandleResult }) =>
hasTargetHandle ? handle.type === 'target' : hasValidHandle ? validHandleResult.isValid : true, hasTargetHandle ? handle.type === 'target' : hasValidHandle ? validHandleResult.isValid : true,
@@ -157,15 +157,17 @@ export function isValidHandle(
const handleDomNode = doc.querySelector(`.vue-flow__handle[data-id="${handle?.nodeId}-${handle?.id}-${handle?.type}"]`) const handleDomNode = doc.querySelector(`.vue-flow__handle[data-id="${handle?.nodeId}-${handle?.id}-${handle?.type}"]`)
const { x, y } = getEventPosition(event) const { x, y } = getEventPosition(event)
const handleBelow = doc.elementFromPoint(x, y) const elementBelow = doc.elementFromPoint(x, y)
// we always want to prioritize the handle below the mouse cursor over the closest distance handle, // we always want to prioritize the handle below the mouse cursor over the closest distance handle,
// because it could be that the center of another handle is closer to the mouse pointer than the handle below the cursor // because it could be that the center of another handle is closer to the mouse pointer than the handle below the cursor
const handleToCheck = handleBelow?.classList.contains('vue-flow__handle') ? handleBelow : handleDomNode const handleToCheck = elementBelow?.classList.contains('vue-flow__handle') ? elementBelow : handleDomNode
const result = defaultValidHandleResult() const result = defaultValidHandleResult()
if (handleToCheck) { if (handleToCheck) {
result.handleDomNode = handleToCheck
const handleType = getHandleType(undefined, handleToCheck) const handleType = getHandleType(undefined, handleToCheck)
const handleNodeId = handleToCheck.getAttribute('data-nodeid')! const handleNodeId = handleToCheck.getAttribute('data-nodeid')!
const handleId = handleToCheck.getAttribute('data-handleid') const handleId = handleToCheck.getAttribute('data-handleid')