fix(nodewrapper): dont fire onDragStop on click
This commit is contained in:
Vendored
+18
@@ -33239,6 +33239,7 @@
|
|||||||
|
|
||||||
var _onDrag = function onDrag(evt, _ref2) {
|
var _onDrag = function onDrag(evt, _ref2) {
|
||||||
var dispatch = _ref2.dispatch,
|
var dispatch = _ref2.dispatch,
|
||||||
|
setDragging = _ref2.setDragging,
|
||||||
id = _ref2.id,
|
id = _ref2.id,
|
||||||
offset = _ref2.offset,
|
offset = _ref2.offset,
|
||||||
transform = _ref2.transform;
|
transform = _ref2.transform;
|
||||||
@@ -33246,6 +33247,7 @@
|
|||||||
x: evt.clientX * (1 / [transform[2]]),
|
x: evt.clientX * (1 / [transform[2]]),
|
||||||
y: evt.clientY * (1 / [transform[2]])
|
y: evt.clientY * (1 / [transform[2]])
|
||||||
};
|
};
|
||||||
|
setDragging(true);
|
||||||
dispatch(updateNodePos(id, {
|
dispatch(updateNodePos(id, {
|
||||||
x: scaledClient.x - [transform[0]] - offset.x,
|
x: scaledClient.x - [transform[0]] - offset.x,
|
||||||
y: scaledClient.y - [transform[1]] - offset.y
|
y: scaledClient.y - [transform[1]] - offset.y
|
||||||
@@ -33279,10 +33281,18 @@
|
|||||||
|
|
||||||
var _onStop = function onStop(_ref4) {
|
var _onStop = function onStop(_ref4) {
|
||||||
var onNodeDragStop = _ref4.onNodeDragStop,
|
var onNodeDragStop = _ref4.onNodeDragStop,
|
||||||
|
setDragging = _ref4.setDragging,
|
||||||
|
isDragging = _ref4.isDragging,
|
||||||
id = _ref4.id,
|
id = _ref4.id,
|
||||||
type = _ref4.type,
|
type = _ref4.type,
|
||||||
position = _ref4.position,
|
position = _ref4.position,
|
||||||
data = _ref4.data;
|
data = _ref4.data;
|
||||||
|
|
||||||
|
if (!isDragging) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
setDragging(false);
|
||||||
onNodeDragStop({
|
onNodeDragStop({
|
||||||
id: id,
|
id: id,
|
||||||
type: type,
|
type: type,
|
||||||
@@ -33303,6 +33313,11 @@
|
|||||||
offset = _useState2[0],
|
offset = _useState2[0],
|
||||||
setOffset = _useState2[1];
|
setOffset = _useState2[1];
|
||||||
|
|
||||||
|
var _useState3 = React.useState(false),
|
||||||
|
_useState4 = _slicedToArray(_useState3, 2),
|
||||||
|
isDragging = _useState4[0],
|
||||||
|
setDragging = _useState4[1];
|
||||||
|
|
||||||
var id = props.id,
|
var id = props.id,
|
||||||
type = props.type,
|
type = props.type,
|
||||||
data = props.data,
|
data = props.data,
|
||||||
@@ -33359,6 +33374,7 @@
|
|||||||
onDrag: function onDrag(evt) {
|
onDrag: function onDrag(evt) {
|
||||||
return _onDrag(evt, {
|
return _onDrag(evt, {
|
||||||
dispatch: dispatch,
|
dispatch: dispatch,
|
||||||
|
setDragging: setDragging,
|
||||||
id: id,
|
id: id,
|
||||||
offset: offset,
|
offset: offset,
|
||||||
transform: transform
|
transform: transform
|
||||||
@@ -33367,6 +33383,8 @@
|
|||||||
onStop: function onStop() {
|
onStop: function onStop() {
|
||||||
return _onStop({
|
return _onStop({
|
||||||
onNodeDragStop: onNodeDragStop,
|
onNodeDragStop: onNodeDragStop,
|
||||||
|
isDragging: isDragging,
|
||||||
|
setDragging: setDragging,
|
||||||
id: id,
|
id: id,
|
||||||
type: type,
|
type: type,
|
||||||
position: position,
|
position: position,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React, { PureComponent } from 'react';
|
import React, { PureComponent } from 'react';
|
||||||
|
|
||||||
import Graph, { isEdge, removeElements, getOutgoers, SourceHandle, TargetHandle } from '../src';
|
import Graph, { isEdge, removeElements, getOutgoers, SourceHandle, TargetHandle } from '../src';
|
||||||
// import Graph from '../dist/ReactGraph';
|
// import Graph, { isEdge, removeElements, getOutgoers, SourceHandle, TargetHandle } from '../dist/ReactGraph';
|
||||||
|
|
||||||
const SpecialNode = ({ data, styles }) => (
|
const SpecialNode = ({ data, styles }) => (
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -41647,6 +41647,7 @@ var _onStart = function onStart(evt, _ref) {
|
|||||||
|
|
||||||
var _onDrag = function onDrag(evt, _ref2) {
|
var _onDrag = function onDrag(evt, _ref2) {
|
||||||
var dispatch = _ref2.dispatch,
|
var dispatch = _ref2.dispatch,
|
||||||
|
setDragging = _ref2.setDragging,
|
||||||
id = _ref2.id,
|
id = _ref2.id,
|
||||||
offset = _ref2.offset,
|
offset = _ref2.offset,
|
||||||
transform = _ref2.transform;
|
transform = _ref2.transform;
|
||||||
@@ -41654,6 +41655,7 @@ var _onDrag = function onDrag(evt, _ref2) {
|
|||||||
x: evt.clientX * (1 / [transform[2]]),
|
x: evt.clientX * (1 / [transform[2]]),
|
||||||
y: evt.clientY * (1 / [transform[2]])
|
y: evt.clientY * (1 / [transform[2]])
|
||||||
};
|
};
|
||||||
|
setDragging(true);
|
||||||
dispatch((0, _actions.updateNodePos)(id, {
|
dispatch((0, _actions.updateNodePos)(id, {
|
||||||
x: scaledClient.x - [transform[0]] - offset.x,
|
x: scaledClient.x - [transform[0]] - offset.x,
|
||||||
y: scaledClient.y - [transform[1]] - offset.y
|
y: scaledClient.y - [transform[1]] - offset.y
|
||||||
@@ -41687,10 +41689,18 @@ var onNodeClick = function onNodeClick(evt, _ref3) {
|
|||||||
|
|
||||||
var _onStop = function onStop(_ref4) {
|
var _onStop = function onStop(_ref4) {
|
||||||
var onNodeDragStop = _ref4.onNodeDragStop,
|
var onNodeDragStop = _ref4.onNodeDragStop,
|
||||||
|
setDragging = _ref4.setDragging,
|
||||||
|
isDragging = _ref4.isDragging,
|
||||||
id = _ref4.id,
|
id = _ref4.id,
|
||||||
type = _ref4.type,
|
type = _ref4.type,
|
||||||
position = _ref4.position,
|
position = _ref4.position,
|
||||||
data = _ref4.data;
|
data = _ref4.data;
|
||||||
|
|
||||||
|
if (!isDragging) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
setDragging(false);
|
||||||
onNodeDragStop({
|
onNodeDragStop({
|
||||||
id: id,
|
id: id,
|
||||||
type: type,
|
type: type,
|
||||||
@@ -41711,6 +41721,11 @@ var _default = function _default(NodeComponent) {
|
|||||||
offset = _useState2[0],
|
offset = _useState2[0],
|
||||||
setOffset = _useState2[1];
|
setOffset = _useState2[1];
|
||||||
|
|
||||||
|
var _useState3 = (0, _react.useState)(false),
|
||||||
|
_useState4 = _slicedToArray(_useState3, 2),
|
||||||
|
isDragging = _useState4[0],
|
||||||
|
setDragging = _useState4[1];
|
||||||
|
|
||||||
var id = props.id,
|
var id = props.id,
|
||||||
type = props.type,
|
type = props.type,
|
||||||
data = props.data,
|
data = props.data,
|
||||||
@@ -41767,6 +41782,7 @@ var _default = function _default(NodeComponent) {
|
|||||||
onDrag: function onDrag(evt) {
|
onDrag: function onDrag(evt) {
|
||||||
return _onDrag(evt, {
|
return _onDrag(evt, {
|
||||||
dispatch: dispatch,
|
dispatch: dispatch,
|
||||||
|
setDragging: setDragging,
|
||||||
id: id,
|
id: id,
|
||||||
offset: offset,
|
offset: offset,
|
||||||
transform: transform
|
transform: transform
|
||||||
@@ -41775,6 +41791,8 @@ var _default = function _default(NodeComponent) {
|
|||||||
onStop: function onStop() {
|
onStop: function onStop() {
|
||||||
return _onStop({
|
return _onStop({
|
||||||
onNodeDragStop: onNodeDragStop,
|
onNodeDragStop: onNodeDragStop,
|
||||||
|
isDragging: isDragging,
|
||||||
|
setDragging: setDragging,
|
||||||
id: id,
|
id: id,
|
||||||
type: type,
|
type: type,
|
||||||
position: position,
|
position: position,
|
||||||
@@ -42312,7 +42330,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|||||||
|
|
||||||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
||||||
|
|
||||||
// import Graph from '../dist/ReactGraph';
|
// import Graph, { isEdge, removeElements, getOutgoers, SourceHandle, TargetHandle } from '../dist/ReactGraph';
|
||||||
var SpecialNode = function SpecialNode(_ref) {
|
var SpecialNode = function SpecialNode(_ref) {
|
||||||
var data = _ref.data,
|
var data = _ref.data,
|
||||||
styles = _ref.styles;
|
styles = _ref.styles;
|
||||||
@@ -42676,7 +42694,7 @@ var parent = module.bundle.parent;
|
|||||||
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
|
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
|
||||||
var hostname = "" || location.hostname;
|
var hostname = "" || location.hostname;
|
||||||
var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
|
var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
|
||||||
var ws = new WebSocket(protocol + '://' + hostname + ':' + "55193" + '/');
|
var ws = new WebSocket(protocol + '://' + hostname + ':' + "57447" + '/');
|
||||||
|
|
||||||
ws.onmessage = function (event) {
|
ws.onmessage = function (event) {
|
||||||
checkedAssets = {};
|
checkedAssets = {};
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -212,7 +212,7 @@ var parent = module.bundle.parent;
|
|||||||
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
|
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
|
||||||
var hostname = "" || location.hostname;
|
var hostname = "" || location.hostname;
|
||||||
var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
|
var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
|
||||||
var ws = new WebSocket(protocol + '://' + hostname + ':' + "55193" + '/');
|
var ws = new WebSocket(protocol + '://' + hostname + ':' + "57447" + '/');
|
||||||
|
|
||||||
ws.onmessage = function (event) {
|
ws.onmessage = function (event) {
|
||||||
checkedAssets = {};
|
checkedAssets = {};
|
||||||
|
|||||||
@@ -47,12 +47,13 @@ const onStart = (evt, { setOffset, position, transform }) => {
|
|||||||
setOffset({ x: offsetX, y: offsetY });
|
setOffset({ x: offsetX, y: offsetY });
|
||||||
};
|
};
|
||||||
|
|
||||||
const onDrag = (evt, { dispatch, id, offset, transform }) => {
|
const onDrag = (evt, { dispatch, setDragging, id, offset, transform }) => {
|
||||||
const scaledClient = {
|
const scaledClient = {
|
||||||
x: evt.clientX * (1 / [transform[2]]),
|
x: evt.clientX * (1 / [transform[2]]),
|
||||||
y: evt.clientY * (1 / [transform[2]])
|
y: evt.clientY * (1 / [transform[2]])
|
||||||
};
|
};
|
||||||
|
|
||||||
|
setDragging(true);
|
||||||
dispatch(updateNodePos(id, {
|
dispatch(updateNodePos(id, {
|
||||||
x: scaledClient.x - [transform[0]] - offset.x,
|
x: scaledClient.x - [transform[0]] - offset.x,
|
||||||
y: scaledClient.y - [transform[1]] - offset.y
|
y: scaledClient.y - [transform[1]] - offset.y
|
||||||
@@ -70,7 +71,12 @@ const onNodeClick = (evt, { onClick, dispatch, id, type, position, data }) => {
|
|||||||
onClick(node);
|
onClick(node);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onStop = ({ onNodeDragStop, id, type, position, data }) => {
|
const onStop = ({ onNodeDragStop, setDragging, isDragging, id, type, position, data }) => {
|
||||||
|
if (!isDragging) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
setDragging(false);
|
||||||
onNodeDragStop({
|
onNodeDragStop({
|
||||||
id, type, position, data
|
id, type, position, data
|
||||||
});
|
});
|
||||||
@@ -80,6 +86,7 @@ export default NodeComponent => {
|
|||||||
const WrappedComp = memo((props) => {
|
const WrappedComp = memo((props) => {
|
||||||
const nodeElement = useRef(null);
|
const nodeElement = useRef(null);
|
||||||
const [offset, setOffset] = useState({ x: 0, y: 0 });
|
const [offset, setOffset] = useState({ x: 0, y: 0 });
|
||||||
|
const [isDragging, setDragging] = useState(false);
|
||||||
const {
|
const {
|
||||||
id, type, data, transform, xPos, yPos, selectedElements,
|
id, type, data, transform, xPos, yPos, selectedElements,
|
||||||
dispatch, getNodeById, onClick, onNodeDragStop
|
dispatch, getNodeById, onClick, onNodeDragStop
|
||||||
@@ -105,9 +112,9 @@ export default NodeComponent => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<ReactDraggable.DraggableCore
|
<ReactDraggable.DraggableCore
|
||||||
onStart={evt => onStart(evt, { setOffset, transform, position })}
|
onStart={evt => onStart(evt, { setOffset,transform, position })}
|
||||||
onDrag={evt => onDrag(evt, { dispatch, id, offset, transform })}
|
onDrag={evt => onDrag(evt, { dispatch, setDragging, id, offset, transform })}
|
||||||
onStop={() => onStop({ onNodeDragStop, id, type, position, data })}
|
onStop={() => onStop({ onNodeDragStop, isDragging, setDragging, id, type, position, data })}
|
||||||
scale={transform[2]}
|
scale={transform[2]}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
|
|||||||
Reference in New Issue
Block a user