refactor(nodes): Remove DraggableCore component and use composable
* Remove node-element prop from NodeProps
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable'
|
import { useDraggableCore } from '@braks/revue-draggable'
|
||||||
import { useVueFlow } from '../../composables'
|
import { useVueFlow } from '../../composables'
|
||||||
import { GraphNode, NodeComponent, SnapGrid } from '../../types'
|
import { GraphNode, NodeComponent, SnapGrid } from '../../types'
|
||||||
import { NodeId, Slots } from '../../context'
|
import { NodeId, Slots } from '../../context'
|
||||||
@@ -42,38 +42,6 @@ const onSelectNodeHandler = (event: MouseEvent) => {
|
|||||||
store.hooks.nodeClick.trigger({ event, node: node.value })
|
store.hooks.nodeClick.trigger({ event, node: node.value })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const onDragStart: DraggableEventListener = ({ event }) => {
|
|
||||||
store.addSelectedNodes([])
|
|
||||||
store.hooks.nodeDragStart.trigger({ event, node: node.value })
|
|
||||||
|
|
||||||
if (store.selectNodesOnDrag && props.selectable) {
|
|
||||||
store.nodesSelectionActive = false
|
|
||||||
|
|
||||||
if (!node.value.selected) store.addSelectedNodes([node.value])
|
|
||||||
} else if (!store.selectNodesOnDrag && !node.value.selected && props.selectable) {
|
|
||||||
store.nodesSelectionActive = false
|
|
||||||
store.addSelectedNodes([])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const onDrag: DraggableEventListener = ({ event, data: { deltaX, deltaY } }) => {
|
|
||||||
nextTick(() => store.updateNodePosition({ id: node.value.id, diff: { x: deltaX, y: deltaY }, dragging: true }))
|
|
||||||
store.hooks.nodeDrag.trigger({ event, node: node.value })
|
|
||||||
}
|
|
||||||
const onDragStop: DraggableEventListener = ({ event, data: { deltaX, deltaY } }) => {
|
|
||||||
// onDragStop also gets called when user just clicks on a node.
|
|
||||||
// Because of that we set dragging to true inside the onDrag handler and handle the click here
|
|
||||||
if (!node.value.dragging) {
|
|
||||||
if (props.selectable && !store.selectNodesOnDrag && !node.value.selected) {
|
|
||||||
store.addSelectedNodes([node.value])
|
|
||||||
}
|
|
||||||
store.hooks.nodeClick.trigger({ event, node: node.value })
|
|
||||||
return
|
|
||||||
}
|
|
||||||
store.updateNodePosition({ id: node.value.id, diff: { x: deltaX, y: deltaY }, dragging: false })
|
|
||||||
store.hooks.nodeDragStop.trigger({ event, node: node.value })
|
|
||||||
}
|
|
||||||
|
|
||||||
const size = ref<Record<string, string>>()
|
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
const { width, height } = nodeElement.value.getBoundingClientRect()
|
const { width, height } = nodeElement.value.getBoundingClientRect()
|
||||||
@@ -156,6 +124,57 @@ const type = computed(() => {
|
|||||||
|
|
||||||
return slot
|
return slot
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const { scale, onDrag, onDragStart, onDragStop } = useDraggableCore(nodeElement, {
|
||||||
|
handle: node.value.dragHandle,
|
||||||
|
disabled: !props.draggable,
|
||||||
|
grid: props.snapGrid,
|
||||||
|
cancel: `.${store.noDragClassName}`,
|
||||||
|
enableUserSelectHack: false,
|
||||||
|
})
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
watchDebounced(
|
||||||
|
() => store.transform[2],
|
||||||
|
() => {
|
||||||
|
scale.value = store.transform[2]
|
||||||
|
},
|
||||||
|
{ debounce: 5 },
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
onDragStart(({ event }) => {
|
||||||
|
store.addSelectedNodes([])
|
||||||
|
store.hooks.nodeDragStart.trigger({ event, node: node.value })
|
||||||
|
|
||||||
|
if (store.selectNodesOnDrag && props.selectable) {
|
||||||
|
store.nodesSelectionActive = false
|
||||||
|
|
||||||
|
if (!node.value.selected) store.addSelectedNodes([node.value])
|
||||||
|
} else if (!store.selectNodesOnDrag && !node.value.selected && props.selectable) {
|
||||||
|
store.nodesSelectionActive = false
|
||||||
|
store.addSelectedNodes([])
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onDrag(({ event, data: { deltaX, deltaY } }) => {
|
||||||
|
nextTick(() => store.updateNodePosition({ id: node.value.id, diff: { x: deltaX, y: deltaY }, dragging: true }))
|
||||||
|
store.hooks.nodeDrag.trigger({ event, node: node.value })
|
||||||
|
})
|
||||||
|
|
||||||
|
onDragStop(({ event, data: { deltaX, deltaY } }) => {
|
||||||
|
// onDragStop also gets called when user just clicks on a node.
|
||||||
|
// Because of that we set dragging to true inside the onDrag handler and handle the click here
|
||||||
|
if (!node.value.dragging) {
|
||||||
|
if (props.selectable && !store.selectNodesOnDrag && !node.value.selected) {
|
||||||
|
store.addSelectedNodes([node.value])
|
||||||
|
}
|
||||||
|
store.hooks.nodeClick.trigger({ event, node: node.value })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
store.updateNodePosition({ id: node.value.id, diff: { x: deltaX, y: deltaY }, dragging: false })
|
||||||
|
store.hooks.nodeDragStop.trigger({ event, node: node.value })
|
||||||
|
})
|
||||||
</script>
|
</script>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
export default {
|
export default {
|
||||||
@@ -164,67 +183,53 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<DraggableCore
|
<div
|
||||||
:cancel="`.${store.noDragClassName}`"
|
ref="node-element"
|
||||||
:handle="node.dragHandle"
|
:key="`node-${node.id}`"
|
||||||
:disabled="!props.draggable"
|
:class="[
|
||||||
:scale="scaleDebounced"
|
'vue-flow__node',
|
||||||
:grid="props.snapGrid"
|
`vue-flow__node-${name}`,
|
||||||
:enable-user-select-hack="false"
|
store.noPanClassName,
|
||||||
@start="onDragStart"
|
{
|
||||||
@move="onDrag"
|
dragging: node.dragging,
|
||||||
@stop="onDragStop"
|
selected: node.selected,
|
||||||
|
selectable: props.selectable,
|
||||||
|
},
|
||||||
|
getClass(),
|
||||||
|
]"
|
||||||
|
:style="{
|
||||||
|
zIndex: node.computedPosition.z,
|
||||||
|
transform: `translate(${node.computedPosition.x}px,${node.computedPosition.y}px)`,
|
||||||
|
pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
|
||||||
|
...getStyle(),
|
||||||
|
}"
|
||||||
|
:data-id="node.id"
|
||||||
|
@mouseenter="onMouseEnterHandler"
|
||||||
|
@mousemove="onMouseMoveHandler"
|
||||||
|
@mouseleave="onMouseLeaveHandler"
|
||||||
|
@contextmenu="onContextMenuHandler"
|
||||||
|
@click="onSelectNodeHandler"
|
||||||
|
@dblclick="onDoubleClick"
|
||||||
>
|
>
|
||||||
<div
|
<component
|
||||||
ref="node-element"
|
:is="type"
|
||||||
:key="`node-${node.id}`"
|
:id="node.id"
|
||||||
:class="[
|
:type="node.type"
|
||||||
'vue-flow__node',
|
:data="node.data"
|
||||||
`vue-flow__node-${name}`,
|
:selected="!!node.selected"
|
||||||
store.noPanClassName,
|
:connectable="props.connectable"
|
||||||
{
|
:position="node.position"
|
||||||
dragging: node.dragging,
|
:computed-position="node.computedPosition"
|
||||||
selected: node.selected,
|
:dimensions="node.dimensions"
|
||||||
selectable: props.selectable,
|
:is-valid-target-pos="node.isValidTargetPos"
|
||||||
},
|
:is-valid-source-pos="node.isValidSourcePos"
|
||||||
getClass(),
|
:parent-node="node.parentNode"
|
||||||
]"
|
:dragging="!!node.dragging"
|
||||||
:style="{
|
:z-index="node.computedPosition.z"
|
||||||
zIndex: node.computedPosition.z,
|
:target-position="node.targetPosition"
|
||||||
transform: `translate(${node.computedPosition.x}px,${node.computedPosition.y}px)`,
|
:source-position="node.sourcePosition"
|
||||||
pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
|
:label="node.label"
|
||||||
...size,
|
:drag-handle="node.dragHandle"
|
||||||
...getStyle(),
|
/>
|
||||||
}"
|
</div>
|
||||||
:data-id="node.id"
|
|
||||||
@mouseenter="onMouseEnterHandler"
|
|
||||||
@mousemove="onMouseMoveHandler"
|
|
||||||
@mouseleave="onMouseLeaveHandler"
|
|
||||||
@contextmenu="onContextMenuHandler"
|
|
||||||
@click="onSelectNodeHandler"
|
|
||||||
@dblclick="onDoubleClick"
|
|
||||||
>
|
|
||||||
<component
|
|
||||||
:is="type"
|
|
||||||
:id="node.id"
|
|
||||||
:node-element="nodeElement"
|
|
||||||
:type="node.type"
|
|
||||||
:data="node.data"
|
|
||||||
:selected="!!node.selected"
|
|
||||||
:connectable="props.connectable"
|
|
||||||
:position="node.position"
|
|
||||||
:computed-position="node.computedPosition"
|
|
||||||
:dimensions="node.dimensions"
|
|
||||||
:is-valid-target-pos="node.isValidTargetPos"
|
|
||||||
:is-valid-source-pos="node.isValidSourcePos"
|
|
||||||
:parent-node="node.parentNode"
|
|
||||||
:dragging="!!node.dragging"
|
|
||||||
:z-index="node.computedPosition.z"
|
|
||||||
:target-position="node.targetPosition"
|
|
||||||
:source-position="node.sourcePosition"
|
|
||||||
:label="node.label"
|
|
||||||
:drag-handle="node.dragHandle"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</DraggableCore>
|
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -52,8 +52,6 @@ export interface GraphNode<Data = ElementData> extends Node<Data> {
|
|||||||
/** these props are passed to node components */
|
/** these props are passed to node components */
|
||||||
export interface NodeProps<Data = ElementData> {
|
export interface NodeProps<Data = ElementData> {
|
||||||
id: string
|
id: string
|
||||||
/** node DOM-element */
|
|
||||||
nodeElement: HTMLDivElement
|
|
||||||
type: string
|
type: string
|
||||||
data?: Data
|
data?: Data
|
||||||
selected: boolean
|
selected: boolean
|
||||||
@@ -62,7 +60,7 @@ export interface NodeProps<Data = ElementData> {
|
|||||||
computedPosition: XYZPosition
|
computedPosition: XYZPosition
|
||||||
/** x, y position */
|
/** x, y position */
|
||||||
position: XYPosition
|
position: XYPosition
|
||||||
/** node dimensions (width, height) */
|
/** dom element dimensions (width, height) */
|
||||||
dimensions: Dimensions
|
dimensions: Dimensions
|
||||||
label?:
|
label?:
|
||||||
| string
|
| string
|
||||||
|
|||||||
Reference in New Issue
Block a user