From 425fd2e3c021e8d212af035cdfe55f2ba23c78a8 Mon Sep 17 00:00:00 2001 From: moklick Date: Thu, 26 Nov 2020 16:20:53 +0100 Subject: [PATCH 1/3] refactor(onConnectStart): also pass handleId closes #718 --- src/components/Handle/BaseHandle.tsx | 2 +- src/types/index.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Handle/BaseHandle.tsx b/src/components/Handle/BaseHandle.tsx index f6964042..1f80c529 100644 --- a/src/components/Handle/BaseHandle.tsx +++ b/src/components/Handle/BaseHandle.tsx @@ -70,7 +70,7 @@ function onMouseDown( setConnectionNodeId({ connectionNodeId: nodeId, connectionHandleId: handleId, connectionHandleType: handleType }); if (onConnectStart) { - onConnectStart(event, { nodeId, handleType }); + onConnectStart(event, { nodeId, handleId, handleType }); } function resetRecentHandle(): void { diff --git a/src/types/index.ts b/src/types/index.ts index 3476d7a8..97cccef2 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -284,6 +284,7 @@ export type ConnectionLineComponent = React.ComponentType void; export type OnConnectStartParams = { nodeId: ElementId | null; + handleId: ElementId | null; handleType: HandleType | null; }; export type OnConnectStartFunc = (event: ReactMouseEvent, params: OnConnectStartParams) => void; From 1650e6ac82cd1a9c2a1ced437954b1a0e7c373b9 Mon Sep 17 00:00:00 2001 From: moklick Date: Thu, 26 Nov 2020 16:58:15 +0100 Subject: [PATCH 2/3] fix(smoothstep): repair left/right right/left connections --- src/components/Edges/SmoothStepEdge.tsx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/Edges/SmoothStepEdge.tsx b/src/components/Edges/SmoothStepEdge.tsx index eaf1b0f7..3b6b5e5c 100644 --- a/src/components/Edges/SmoothStepEdge.tsx +++ b/src/components/Edges/SmoothStepEdge.tsx @@ -55,6 +55,18 @@ export function getSmoothStepPath({ let firstCornerPath = null; let secondCornerPath = null; + if (sourceX <= targetX) { + firstCornerPath = + sourceY <= targetY ? bottomLeftCorner(sourceX, cY, cornerSize) : topLeftCorner(sourceX, cY, cornerSize); + secondCornerPath = + sourceY <= targetY ? rightTopCorner(targetX, cY, cornerSize) : rightBottomCorner(targetX, cY, cornerSize); + } else { + firstCornerPath = + sourceY < targetY ? bottomRightCorner(sourceX, cY, cornerSize) : topRightCorner(sourceX, cY, cornerSize); + secondCornerPath = + sourceY < targetY ? leftTopCorner(targetX, cY, cornerSize) : leftBottomCorner(targetX, cY, cornerSize); + } + if (leftAndRight.includes(sourcePosition) && leftAndRight.includes(targetPosition)) { if (sourceX <= targetX) { firstCornerPath = @@ -88,18 +100,6 @@ export function getSmoothStepPath({ : topRightCorner(sourceX, targetY, cornerSize); } secondCornerPath = ''; - } else { - if (sourceX <= targetX) { - firstCornerPath = - sourceY <= targetY ? bottomLeftCorner(sourceX, cY, cornerSize) : topLeftCorner(sourceX, cY, cornerSize); - secondCornerPath = - sourceY <= targetY ? rightTopCorner(targetX, cY, cornerSize) : rightBottomCorner(targetX, cY, cornerSize); - } else { - firstCornerPath = - sourceY < targetY ? bottomRightCorner(sourceX, cY, cornerSize) : topRightCorner(sourceX, cY, cornerSize); - secondCornerPath = - sourceY < targetY ? leftTopCorner(targetX, cY, cornerSize) : leftBottomCorner(targetX, cY, cornerSize); - } } return `M ${sourceX},${sourceY}${firstCornerPath}${secondCornerPath}L ${targetX},${targetY}`; From 1afa00a428cc90fe5176d53cf7d1387c42a5e124 Mon Sep 17 00:00:00 2001 From: moklick Date: Sun, 29 Nov 2020 13:31:20 +0100 Subject: [PATCH 3/3] chore: release v8.0.0-next.10 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b423c61..5b2ea283 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "react-flow-renderer", - "version": "8.0.0-next.9", + "version": "8.0.0-next.10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 610aea30..b18d3d22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-flow-renderer", - "version": "8.0.0-next.9", + "version": "8.0.0-next.10", "main": "dist/ReactFlow.js", "module": "dist/ReactFlow.esm.js", "types": "dist/index.d.ts",