Merge branch 'clementloridan-main'

This commit is contained in:
moklick
2021-11-02 14:49:26 +01:00
5 changed files with 29 additions and 11 deletions
+2 -2
View File
@@ -75,8 +75,8 @@
"typescript": "^4.4.4" "typescript": "^4.4.4"
}, },
"peerDependencies": { "peerDependencies": {
"react": "16 || 17", "react": "16 || 17",
"react-dom": "16 || 17" "react-dom": "16 || 17"
}, },
"files": [ "files": [
"dist", "dist",
+9 -3
View File
@@ -27,6 +27,14 @@ interface ConnectionLineProps {
CustomConnectionLineComponent?: ConnectionLineComponent; CustomConnectionLineComponent?: ConnectionLineComponent;
} }
const getSourceHandle = (handleId: ElementId | null, sourceNode: Node, connectionHandleType: HandleType) => {
const handleTypeInverted = connectionHandleType === 'source' ? 'target' : 'source';
const handleBound =
sourceNode.__rf.handleBounds[connectionHandleType] || sourceNode.__rf.handleBounds[handleTypeInverted];
return handleId ? handleBound.find((d: HandleElement) => d.id === handleId) : handleBound[0];
};
export default ({ export default ({
connectionNodeId, connectionNodeId,
connectionHandleId, connectionHandleId,
@@ -53,9 +61,7 @@ export default ({
return null; return null;
} }
const sourceHandle = handleId const sourceHandle = getSourceHandle(handleId, sourceNode, connectionHandleType);
? sourceNode.__rf.handleBounds[connectionHandleType].find((d: HandleElement) => d.id === handleId)
: sourceNode.__rf.handleBounds[connectionHandleType][0];
const sourceHandleX = sourceHandle ? sourceHandle.x + sourceHandle.width / 2 : sourceNode.__rf.width / 2; const sourceHandleX = sourceHandle ? sourceHandle.x + sourceHandle.width / 2 : sourceNode.__rf.width / 2;
const sourceHandleY = sourceHandle ? sourceHandle.y + sourceHandle.height / 2 : sourceNode.__rf.height; const sourceHandleY = sourceHandle ? sourceHandle.y + sourceHandle.height / 2 : sourceNode.__rf.height;
const sourceX = sourceNode.__rf.position.x + sourceHandleX; const sourceX = sourceNode.__rf.position.x + sourceHandleX;
+2 -1
View File
@@ -1,3 +1,4 @@
import { Store } from 'redux';
import configureStore from './configure-store'; import configureStore from './configure-store';
import { ReactFlowState, ConnectionMode } from '../types'; import { ReactFlowState, ConnectionMode } from '../types';
@@ -56,7 +57,7 @@ export const initialState: ReactFlowState = {
reactFlowVersion: typeof __REACT_FLOW_VERSION__ !== 'undefined' ? __REACT_FLOW_VERSION__ : '-', reactFlowVersion: typeof __REACT_FLOW_VERSION__ !== 'undefined' ? __REACT_FLOW_VERSION__ : '-',
}; };
const store = configureStore(initialState); const store: Store = configureStore(initialState);
export type ReactFlowDispatch = typeof store.dispatch; export type ReactFlowDispatch = typeof store.dispatch;
+14 -3
View File
@@ -3,7 +3,10 @@
"outDir": "dist", "outDir": "dist",
"module": "esnext", "module": "esnext",
"target": "esnext", "target": "esnext",
"lib": ["dom", "esnext"], "lib": [
"dom",
"esnext"
],
"jsx": "react", "jsx": "react",
"moduleResolution": "node", "moduleResolution": "node",
"declaration": true, "declaration": true,
@@ -21,6 +24,14 @@
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"esModuleInterop": true "esModuleInterop": true
}, },
"include": ["src"], "include": [
"exclude": ["node_modules", "build", "dist", "example", "rollup.config.js"] "src"
],
"exclude": [
"node_modules",
"build",
"dist",
"example",
"rollup.config.js"
]
} }