fix(connectionLine): add container bounds

This commit is contained in:
moklick
2019-07-31 11:48:16 +02:00
parent 2d5e2d9241
commit 191bc11253
5 changed files with 15 additions and 31 deletions
+5 -10
View File
@@ -33025,9 +33025,10 @@
var Consumer$1 = NodeIdContext.Consumer; var Consumer$1 = NodeIdContext.Consumer;
function _onMouseDown(evt, nodeId, dispatch, onConnect) { function _onMouseDown(evt, nodeId, dispatch, onConnect) {
var containerBounds = document.querySelector('.react-graph').getBoundingClientRect();
var connectionPosition = { var connectionPosition = {
x: evt.clientX, x: evt.clientX - containerBounds.x,
y: evt.clientY y: evt.clientY - containerBounds.y
}; };
dispatch(setConnecting({ dispatch(setConnecting({
connectionPosition: connectionPosition, connectionPosition: connectionPosition,
@@ -33036,8 +33037,8 @@
function onMouseMove(evt) { function onMouseMove(evt) {
dispatch(setConnectionPos({ dispatch(setConnectionPos({
x: evt.clientX, x: evt.clientX - containerBounds.x,
y: evt.clientY y: evt.clientY - containerBounds.y
})); }));
} }
@@ -33178,11 +33179,6 @@
}; };
}; };
var onDragOver = function onDragOver(evt) {
evt.preventDefault();
evt.dataTransfer.dropEffect = 'move';
};
var wrapNode = (function (NodeComponent) { var wrapNode = (function (NodeComponent) {
return React.memo(function (props) { return React.memo(function (props) {
var nodeElement = React.useRef(null); var nodeElement = React.useRef(null);
@@ -33294,7 +33290,6 @@
onStop: onStop, onStop: onStop,
scale: k scale: k
}, React__default.createElement("div", { }, React__default.createElement("div", {
onDragOver: onDragOver,
className: nodeClasses, className: nodeClasses,
ref: nodeElement, ref: nodeElement,
style: { style: {
+5 -10
View File
@@ -41282,9 +41282,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
function _onMouseDown(evt, nodeId, dispatch, onConnect) { function _onMouseDown(evt, nodeId, dispatch, onConnect) {
var containerBounds = document.querySelector('.react-graph').getBoundingClientRect();
var connectionPosition = { var connectionPosition = {
x: evt.clientX, x: evt.clientX - containerBounds.x,
y: evt.clientY y: evt.clientY - containerBounds.y
}; };
dispatch((0, _actions.setConnecting)({ dispatch((0, _actions.setConnecting)({
connectionPosition: connectionPosition, connectionPosition: connectionPosition,
@@ -41293,8 +41294,8 @@ function _onMouseDown(evt, nodeId, dispatch, onConnect) {
function onMouseMove(evt) { function onMouseMove(evt) {
dispatch((0, _actions.setConnectionPos)({ dispatch((0, _actions.setConnectionPos)({
x: evt.clientX, x: evt.clientX - containerBounds.x,
y: evt.clientY y: evt.clientY - containerBounds.y
})); }));
} }
@@ -41574,11 +41575,6 @@ var getHandleBounds = function getHandleBounds(sel, nodeElement, parentBounds, k
}; };
}; };
var onDragOver = function onDragOver(evt) {
evt.preventDefault();
evt.dataTransfer.dropEffect = 'move';
};
var _default = function _default(NodeComponent) { var _default = function _default(NodeComponent) {
return (0, _react.memo)(function (props) { return (0, _react.memo)(function (props) {
var nodeElement = (0, _react.useRef)(null); var nodeElement = (0, _react.useRef)(null);
@@ -41690,7 +41686,6 @@ var _default = function _default(NodeComponent) {
onStop: onStop, onStop: onStop,
scale: k scale: k
}, _react.default.createElement("div", { }, _react.default.createElement("div", {
onDragOver: onDragOver,
className: nodeClasses, className: nodeClasses,
ref: nodeElement, ref: nodeElement,
style: { style: {
File diff suppressed because one or more lines are too long
+4 -3
View File
@@ -6,11 +6,12 @@ import { GraphContext } from '../../GraphContext';
import { setConnecting, setConnectionPos } from '../../state/actions'; import { setConnecting, setConnectionPos } from '../../state/actions';
function onMouseDown(evt, nodeId, dispatch, onConnect) { function onMouseDown(evt, nodeId, dispatch, onConnect) {
const connectionPosition = { x: evt.clientX, y: evt.clientY }; const containerBounds = document.querySelector('.react-graph').getBoundingClientRect();
const connectionPosition = { x: evt.clientX - containerBounds.x, y: evt.clientY - containerBounds.y };
dispatch(setConnecting({ connectionPosition, connectionSourceId: nodeId })) dispatch(setConnecting({ connectionPosition, connectionSourceId: nodeId }))
function onMouseMove(evt) { function onMouseMove(evt) {
dispatch(setConnectionPos({ x: evt.clientX, y: evt.clientY })); dispatch(setConnectionPos({ x: evt.clientX - containerBounds.x, y: evt.clientY - containerBounds.y }));
} }
function onMouseUp(evt) { function onMouseUp(evt) {
@@ -46,7 +47,7 @@ export default memo(({ source, target, className = null, ...rest }) => {
className={handleClasses} className={handleClasses}
{...rest} {...rest}
/> />
) );
} }
return ( return (
-7
View File
@@ -29,12 +29,6 @@ const getHandleBounds = (sel, nodeElement, parentBounds, k) => {
}; };
}; };
const onDragOver = evt => {
evt.preventDefault();
evt.dataTransfer.dropEffect = 'move';
}
export default NodeComponent => memo((props) => { export default NodeComponent => memo((props) => {
const nodeElement = useRef(null); const nodeElement = useRef(null);
const { state, dispatch } = useContext(GraphContext); const { state, dispatch } = useContext(GraphContext);
@@ -113,7 +107,6 @@ export default NodeComponent => memo((props) => {
scale={k} scale={k}
> >
<div <div
onDragOver={onDragOver}
className={nodeClasses} className={nodeClasses}
ref={nodeElement} ref={nodeElement}
style={{ zIndex: selected ? 10 : 3, transform: `translate(${position.x}px,${position.y}px)` }} style={{ zIndex: selected ? 10 : 3, transform: `translate(${position.x}px,${position.y}px)` }}