Merge branch 'main' of https://github.com/clementloridan/react-flow into clementloridan-main

This commit is contained in:
moklick
2021-11-02 14:41:00 +01:00
5 changed files with 38 additions and 12 deletions
+17 -3
View File
@@ -53,9 +53,22 @@ export default ({
return null;
}
const sourceHandle = handleId
? sourceNode.__rf.handleBounds[connectionHandleType].find((d: HandleElement) => d.id === handleId)
: sourceNode.__rf.handleBounds[connectionHandleType][0];
const getSourceHandle = (handleId: ElementId | null, sourceNode: Node) => {
const handleBound = sourceNode.__rf.handleBounds[connectionHandleType];
if (handleBound) {
if (handleId) {
return sourceNode.__rf.handleBounds[connectionHandleType].find((d: HandleElement) => d.id === handleId);
}
return sourceNode.__rf.handleBounds[connectionHandleType][0]
}
const handleType = connectionHandleType === 'source' ? 'target' : 'source';
if (handleId) {
return sourceNode.__rf.handleBounds[handleType].find((d: HandleElement) => d.id === handleId);
}
return sourceNode.__rf.handleBounds[handleType][0]
}
const sourceHandle = getSourceHandle(handleId, sourceNode);
const sourceHandleX = sourceHandle ? sourceHandle.x + sourceHandle.width / 2 : sourceNode.__rf.width / 2;
const sourceHandleY = sourceHandle ? sourceHandle.y + sourceHandle.height / 2 : sourceNode.__rf.height;
const sourceX = sourceNode.__rf.position.x + sourceHandleX;
@@ -68,6 +81,7 @@ export default ({
const targetPosition = isRightOrLeft ? Position.Left : Position.Top;
if (CustomConnectionLineComponent) {
return (
<g className="react-flow__connection">
<CustomConnectionLineComponent
+2 -1
View File
@@ -1,3 +1,4 @@
import { Store } from 'redux';
import configureStore from './configure-store';
import { ReactFlowState, ConnectionMode } from '../types';
@@ -56,7 +57,7 @@ export const initialState: ReactFlowState = {
reactFlowVersion: typeof __REACT_FLOW_VERSION__ !== 'undefined' ? __REACT_FLOW_VERSION__ : '-',
};
const store = configureStore(initialState);
const store: Store = configureStore(initialState);
export type ReactFlowDispatch = typeof store.dispatch;