feat(core): support origin on node level closes #2874

This commit is contained in:
moklick
2023-03-14 12:42:06 +01:00
parent cca25a792b
commit 13e7cc340c
8 changed files with 26 additions and 19 deletions
+2 -2
View File
@@ -92,8 +92,8 @@ const createRFStore = () =>
[internalsSymbol]: {
...node[internalsSymbol],
handleBounds: {
source: getHandleBounds('.source', update.nodeElement, zoom, nodeOrigin),
target: getHandleBounds('.target', update.nodeElement, zoom, nodeOrigin),
source: getHandleBounds('.source', update.nodeElement, zoom, node.origin || nodeOrigin),
target: getHandleBounds('.target', update.nodeElement, zoom, node.origin || nodeOrigin),
},
},
...dimensions,
+4 -3
View File
@@ -16,7 +16,7 @@ function calculateXYZPosition(
return result;
}
const parentNode = nodeInternals.get(node.parentNode)!;
const parentNodePosition = getNodePositionWithOrigin(parentNode, nodeOrigin);
const parentNodePosition = getNodePositionWithOrigin(parentNode, parentNode?.origin || nodeOrigin);
return calculateXYZPosition(
parentNode,
@@ -26,7 +26,7 @@ function calculateXYZPosition(
y: (result.y ?? 0) + parentNodePosition.y,
z: (parentNode[internalsSymbol]?.z ?? 0) > (result.z ?? 0) ? parentNode[internalsSymbol]?.z ?? 0 : result.z ?? 0,
},
nodeOrigin
parentNode.origin || nodeOrigin
);
}
@@ -41,6 +41,7 @@ export function updateAbsoluteNodePositions(
}
if (node.parentNode || parentNodes?.[node.id]) {
const parentNode = node.parentNode ? nodeInternals.get(node.parentNode) : null;
const { x, y, z } = calculateXYZPosition(
node,
nodeInternals,
@@ -48,7 +49,7 @@ export function updateAbsoluteNodePositions(
...node.position,
z: node[internalsSymbol]?.z ?? 0,
},
nodeOrigin
parentNode?.origin || nodeOrigin
);
node.positionAbsolute = {