refactor(nodes): Replace DraggableCore with composable

This commit is contained in:
Braks
2022-04-11 11:30:10 +02:00
parent 8f2d94ae55
commit 342d0305a6
2 changed files with 28 additions and 25 deletions
@@ -121,6 +121,7 @@ const { scale, onDrag, onDragStart, onDragStop } = useDraggableCore(nodeElement,
grid: props.snapGrid, grid: props.snapGrid,
cancel: `.${store.noDragClassName}`, cancel: `.${store.noDragClassName}`,
enableUserSelectHack: false, enableUserSelectHack: false,
scale: store.transform[2],
}) })
onMounted(() => { onMounted(() => {
@@ -1,10 +1,12 @@
<script lang="ts" setup> <script lang="ts" setup>
import { DraggableCore, DraggableEventListener } from '@braks/revue-draggable' import { useDraggableCore } from '@braks/revue-draggable'
import { useVueFlow } from '../../composables' import { useVueFlow } from '../../composables'
import { getRectOfNodes } from '../../utils' import { getRectOfNodes } from '../../utils'
const { store } = useVueFlow() const { store } = useVueFlow()
const el = templateRef<HTMLDivElement>('el', null)
const selectedNodesBBox = computed(() => getRectOfNodes(store.getSelectedNodes)) const selectedNodesBBox = computed(() => getRectOfNodes(store.getSelectedNodes))
const innerStyle = computed(() => ({ const innerStyle = computed(() => ({
@@ -16,28 +18,37 @@ const innerStyle = computed(() => ({
const transform = computed(() => `translate(${store.transform[0]}px,${store.transform[1]}px) scale(${store.transform[2]})`) const transform = computed(() => `translate(${store.transform[0]}px,${store.transform[1]}px) scale(${store.transform[2]})`)
const scale = controlledComputed(
() => store.transform[2],
() => store.transform[2],
)
const scaleDebounced = debouncedRef(scale, 5)
watch(selectedNodesBBox, (v) => (store.selectedNodesBbox = v)) watch(selectedNodesBBox, (v) => (store.selectedNodesBbox = v))
const onStart: DraggableEventListener = ({ event }) => const onContextMenu = (event: MouseEvent) => store.hooks.selectionContextMenu.trigger({ event, nodes: store.getSelectedNodes })
store.hooks.selectionDragStart.trigger({ event, nodes: store.getSelectedNodes })
const onDrag: DraggableEventListener = ({ event, data: { deltaX, deltaY } }) => { const { onDragStart, onDrag, onDragStop, scale } = useDraggableCore(el, {
grid: store.snapToGrid ? store.snapGrid : undefined,
enableUserSelectHack: false,
scale: store.transform[2],
})
onMounted(() => {
watchDebounced(
() => store.transform[2],
() => {
scale.value = store.transform[2]
},
{ debounce: 5 },
)
})
onDragStart(({ event }) => store.hooks.selectionDragStart.trigger({ event, nodes: store.getSelectedNodes }))
onDrag(({ event, data: { deltaX, deltaY } }) => {
store.hooks.selectionDrag.trigger({ event, nodes: store.getSelectedNodes }) store.hooks.selectionDrag.trigger({ event, nodes: store.getSelectedNodes })
store.updateNodePosition({ diff: { x: deltaX, y: deltaY }, dragging: true }) store.updateNodePosition({ diff: { x: deltaX, y: deltaY }, dragging: true })
} })
const onStop: DraggableEventListener = ({ event }) => { onDragStop(({ event }) => {
store.hooks.selectionDragStop.trigger({ event, nodes: store.getSelectedNodes }) store.hooks.selectionDragStop.trigger({ event, nodes: store.getSelectedNodes })
store.getSelectedNodes.forEach((node) => (node.dragging = false)) store.getSelectedNodes.forEach((node) => (node.dragging = false))
} })
const onContextMenu = (event: MouseEvent) => store.hooks.selectionContextMenu.trigger({ event, nodes: store.getSelectedNodes })
</script> </script>
<script lang="ts"> <script lang="ts">
export default { export default {
@@ -46,15 +57,6 @@ export default {
</script> </script>
<template> <template>
<div class="vue-flow__nodesselection vue-flow__container" :class="store.noPanClassName" :style="{ transform }"> <div class="vue-flow__nodesselection vue-flow__container" :class="store.noPanClassName" :style="{ transform }">
<DraggableCore <div ref="el" class="vue-flow__nodesselection-rect" :style="innerStyle" @contextmenu="onContextMenu" />
:grid="store.snapToGrid ? store.snapGrid : undefined"
:enable-user-select-hack="false"
:scale="scaleDebounced"
@start="onStart"
@move="onDrag"
@stop="onStop"
>
<div class="vue-flow__nodesselection-rect" :style="innerStyle" @contextmenu="onContextMenu" />
</DraggableCore>
</div> </div>
</template> </template>