chore: update revue-draggable to latest version
fix: selection not draggable after creation selection (stop event propagation) * naming collision with eventlistener and callback on draggable component (everything being called 2x)
This commit is contained in:
+1
-1
@@ -28,7 +28,7 @@
|
|||||||
"lint": "yarn lint:js"
|
"lint": "yarn lint:js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@braks/revue-draggable": "^0.2.1-6",
|
"@braks/revue-draggable": "^0.2.4",
|
||||||
"@types/d3": "^7.0.0",
|
"@types/d3": "^7.0.0",
|
||||||
"d3": "^7.0.0",
|
"d3": "^7.0.0",
|
||||||
"d3-selection": "^3.0.0",
|
"d3-selection": "^3.0.0",
|
||||||
|
|||||||
@@ -162,14 +162,12 @@ export default (NodeComponent: DefineComponent<WrapNodeProps>) => {
|
|||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const scale = computed(() => store.transform[2] || 1);
|
|
||||||
|
|
||||||
return () => (
|
return () => (
|
||||||
<DraggableCore
|
<DraggableCore
|
||||||
start={onDragStart}
|
start={onDragStart}
|
||||||
move={onDrag}
|
move={onDrag}
|
||||||
stop={onDragStop}
|
stop={onDragStop}
|
||||||
scale={scale.value}
|
scale={store.transform[2]}
|
||||||
disabled={!props.isDraggable}
|
disabled={!props.isDraggable}
|
||||||
cancel=".nodrag"
|
cancel=".nodrag"
|
||||||
grid={grid.value}
|
grid={grid.value}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* made a selectio with on or several nodes
|
* made a selectio with on or several nodes
|
||||||
*/
|
*/
|
||||||
import { computed, defineComponent, inject, PropType } from 'vue';
|
import { computed, defineComponent, inject, PropType } from 'vue';
|
||||||
import { Draggable, DraggableEventHandler } from '@braks/revue-draggable';
|
import { Draggable, DraggableEventListener } from '@braks/revue-draggable';
|
||||||
import { isNode } from '../../utils/graph';
|
import { isNode } from '../../utils/graph';
|
||||||
import { Node, RevueFlowStore } from '../../types';
|
import { Node, RevueFlowStore } from '../../types';
|
||||||
|
|
||||||
@@ -65,13 +65,12 @@ const NodesSelection = defineComponent({
|
|||||||
left: `${store.selectedNodesBbox.x}px`
|
left: `${store.selectedNodesBbox.x}px`
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const onStart: DraggableEventHandler = (event: MouseEvent) => {
|
const onStart: DraggableEventListener = ({ event }) => {
|
||||||
console.log('ondragstart');
|
event.stopPropagation();
|
||||||
props.onSelectionDragStart?.(event, selectedNodes.value);
|
props.onSelectionDragStart?.(event, selectedNodes.value);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onDrag: DraggableEventHandler = (event, data) => {
|
const onDrag: DraggableEventListener = ({ event, data }) => {
|
||||||
console.log('ondrag');
|
|
||||||
props.onSelectionDrag?.(event, selectedNodes.value);
|
props.onSelectionDrag?.(event, selectedNodes.value);
|
||||||
|
|
||||||
store.updateNodePosDiff({
|
store.updateNodePosDiff({
|
||||||
@@ -83,8 +82,7 @@ const NodesSelection = defineComponent({
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const onStop: DraggableEventHandler = (event: MouseEvent) => {
|
const onStop: DraggableEventListener = ({ event }) => {
|
||||||
console.log('ondragend');
|
|
||||||
store.updateNodePosDiff({
|
store.updateNodePosDiff({
|
||||||
isDragging: false
|
isDragging: false
|
||||||
});
|
});
|
||||||
@@ -106,9 +104,9 @@ const NodesSelection = defineComponent({
|
|||||||
) : (
|
) : (
|
||||||
<div class="revue-flow__nodesselection" style={style.value}>
|
<div class="revue-flow__nodesselection" style={style.value}>
|
||||||
<Draggable
|
<Draggable
|
||||||
start={onStart}
|
onStart={onStart}
|
||||||
move={onDrag}
|
onMove={onDrag}
|
||||||
stop={onStop}
|
onStop={onStop}
|
||||||
scale={store.transform[2]}
|
scale={store.transform[2]}
|
||||||
grid={grid.value}
|
grid={grid.value}
|
||||||
enableUserSelectHack={false}
|
enableUserSelectHack={false}
|
||||||
|
|||||||
@@ -262,10 +262,10 @@
|
|||||||
"@babel/helper-validator-identifier" "^7.14.5"
|
"@babel/helper-validator-identifier" "^7.14.5"
|
||||||
to-fast-properties "^2.0.0"
|
to-fast-properties "^2.0.0"
|
||||||
|
|
||||||
"@braks/revue-draggable@^0.2.1-6":
|
"@braks/revue-draggable@^0.2.4":
|
||||||
version "0.2.1-6"
|
version "0.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/@braks/revue-draggable/-/revue-draggable-0.2.1-6.tgz#6a0b5bf837d7c6a5b2380f3a2b6687271121980b"
|
resolved "https://registry.yarnpkg.com/@braks/revue-draggable/-/revue-draggable-0.2.4.tgz#a3af0c27f32a1845f4182ae579ce80cc88fd9019"
|
||||||
integrity sha512-umY2rLspfkrYfRqDCnV3RvvSiqQPio4Mjdpcp/T+IF/kj0ym7UgA11c017wEQmzUmXwHrgL050bC/LBW5/KJNQ==
|
integrity sha512-8hDMuO7fl5KCshmg87aK3bQt371f3jPOZ35ip4gdcalP2fEnusVv8+AjWP1DHR2lObDTjovn30LzCK4Ily08LA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@vueuse/core" "^5.1.3"
|
"@vueuse/core" "^5.1.3"
|
||||||
vue-demi latest
|
vue-demi latest
|
||||||
|
|||||||
Reference in New Issue
Block a user