feat(nodes): Allow nodes to pass all draggable options
* omits scale, grid, enableuserselecthack and enabletransformfix as valid options for draggable * remove event interface and emits from nodewrapper Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable'
|
import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable'
|
||||||
import { useStore } from '../../composables'
|
import { useStore } from '../../composables'
|
||||||
import { FlowEvents, GraphNode, SnapGrid, VFInternals } from '../../types'
|
import { GraphNode, SnapGrid, VFInternals, Draggable } from '../../types'
|
||||||
import { NodeId } from '../../context'
|
import { NodeId } from '../../context'
|
||||||
|
|
||||||
interface NodeWrapperProps {
|
interface NodeWrapperProps {
|
||||||
@@ -10,26 +10,13 @@ interface NodeWrapperProps {
|
|||||||
selectNodesOnDrag?: boolean
|
selectNodesOnDrag?: boolean
|
||||||
snapGrid?: SnapGrid
|
snapGrid?: SnapGrid
|
||||||
component?: any
|
component?: any
|
||||||
draggable?: boolean
|
draggable?: Draggable
|
||||||
selectable?: boolean
|
selectable?: boolean
|
||||||
connectable?: boolean
|
connectable?: boolean
|
||||||
scale?: number
|
scale?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
interface NodeEvents {
|
|
||||||
(event: 'mouseEnter', data: FlowEvents['nodeMouseEnter']): void
|
|
||||||
(event: 'mouseMove', data: FlowEvents['nodeMouseMove']): void
|
|
||||||
(event: 'mouseLeave', data: FlowEvents['nodeMouseLeave']): void
|
|
||||||
(event: 'contextMenu', data: FlowEvents['nodeContextMenu']): void
|
|
||||||
(event: 'click', data: FlowEvents['nodeClick']): void
|
|
||||||
(event: 'dblClick', data: FlowEvents['nodeDoubleClick']): void
|
|
||||||
(event: 'dragStart', data: FlowEvents['nodeDragStart']): void
|
|
||||||
(event: 'drag', data: FlowEvents['nodeDrag']): void
|
|
||||||
(event: 'dragStop', data: FlowEvents['nodeDragStop']): void
|
|
||||||
}
|
|
||||||
|
|
||||||
const props = defineProps<NodeWrapperProps>()
|
const props = defineProps<NodeWrapperProps>()
|
||||||
const emit = defineEmits<NodeEvents>()
|
|
||||||
|
|
||||||
const store = useStore()
|
const store = useStore()
|
||||||
provide(NodeId, props.node.id)
|
provide(NodeId, props.node.id)
|
||||||
@@ -39,41 +26,13 @@ const nodeElement = templateRef<HTMLDivElement>('node-element', null)
|
|||||||
const selected = computed(() => props.selectable && store.selectedElements?.some(({ id }) => id === props.node.id))
|
const selected = computed(() => props.selectable && store.selectedElements?.some(({ id }) => id === props.node.id))
|
||||||
|
|
||||||
const onMouseEnterHandler = () =>
|
const onMouseEnterHandler = () =>
|
||||||
props.vf.isDragging &&
|
props.vf.isDragging && ((event: MouseEvent) => store.hooks.nodeMouseEnter.trigger({ event, node: props.node }))
|
||||||
((event: MouseEvent) => {
|
|
||||||
const data = { event, node: props.node }
|
|
||||||
emit('mouseEnter', data)
|
|
||||||
store.hooks.nodeMouseEnter.trigger(data)
|
|
||||||
})
|
|
||||||
|
|
||||||
const onMouseMoveHandler = () =>
|
const onMouseMoveHandler = () =>
|
||||||
props.vf.isDragging &&
|
props.vf.isDragging && ((event: MouseEvent) => store.hooks.nodeMouseMove.trigger({ event, node: props.node }))
|
||||||
((event: MouseEvent) => {
|
|
||||||
const data = { event, node: props.node }
|
|
||||||
emit('mouseMove', data)
|
|
||||||
store.hooks.nodeMouseMove.trigger(data)
|
|
||||||
})
|
|
||||||
|
|
||||||
const onMouseLeaveHandler = () =>
|
const onMouseLeaveHandler = () =>
|
||||||
props.vf.isDragging &&
|
props.vf.isDragging && ((event: MouseEvent) => store.hooks.nodeMouseLeave.trigger({ event, node: props.node }))
|
||||||
((event: MouseEvent) => {
|
const onContextMenuHandler = () => (event: MouseEvent) => store.hooks.nodeContextMenu.trigger({ event, node: props.node })
|
||||||
const data = { event, node: props.node }
|
const onDoubleClick = () => (event: MouseEvent) => store.hooks.nodeDoubleClick.trigger({ event, node: props.node })
|
||||||
emit('mouseLeave', data)
|
|
||||||
store.hooks.nodeMouseLeave.trigger(data)
|
|
||||||
})
|
|
||||||
|
|
||||||
const onContextMenuHandler = () => (event: MouseEvent) => {
|
|
||||||
const data = { event, node: props.node }
|
|
||||||
emit('contextMenu', data)
|
|
||||||
store.hooks.nodeContextMenu.trigger(data)
|
|
||||||
}
|
|
||||||
|
|
||||||
const onDoubleClick = () => (event: MouseEvent) => {
|
|
||||||
const data = { event, node: props.node }
|
|
||||||
emit('dblClick', data)
|
|
||||||
store.hooks.nodeDoubleClick.trigger({ event, node: props.node })
|
|
||||||
}
|
|
||||||
|
|
||||||
const onSelectNodeHandler = (event: MouseEvent) => {
|
const onSelectNodeHandler = (event: MouseEvent) => {
|
||||||
const n = props.node
|
const n = props.node
|
||||||
if (!props.draggable) {
|
if (!props.draggable) {
|
||||||
@@ -81,14 +40,11 @@ const onSelectNodeHandler = (event: MouseEvent) => {
|
|||||||
store.unsetNodesSelection()
|
store.unsetNodesSelection()
|
||||||
if (!selected.value) store.addSelectedElements([n])
|
if (!selected.value) store.addSelectedElements([n])
|
||||||
}
|
}
|
||||||
emit('click', { event, node: n })
|
|
||||||
store.hooks.nodeClick.trigger({ event, node: n })
|
store.hooks.nodeClick.trigger({ event, node: n })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const onDragStart: DraggableEventListener = ({ event }) => {
|
const onDragStart: DraggableEventListener = ({ event }) => {
|
||||||
const n = props.node
|
const n = props.node
|
||||||
emit('dragStart', { event, node: n })
|
|
||||||
store.hooks.nodeDragStart.trigger({ event, node: n })
|
store.hooks.nodeDragStart.trigger({ event, node: n })
|
||||||
|
|
||||||
if (props.selectNodesOnDrag && props.selectable) {
|
if (props.selectNodesOnDrag && props.selectable) {
|
||||||
@@ -100,12 +56,10 @@ const onDragStart: DraggableEventListener = ({ event }) => {
|
|||||||
store.addSelectedElements([])
|
store.addSelectedElements([])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const onDrag: DraggableEventListener = ({ event, data }) => {
|
const onDrag: DraggableEventListener = ({ event, data }) => {
|
||||||
const n = props.node
|
const n = props.node
|
||||||
n.position.x += data.deltaX
|
n.position.x += data.deltaX
|
||||||
n.position.y += data.deltaY
|
n.position.y += data.deltaY
|
||||||
emit('drag', { event, node: n })
|
|
||||||
store.hooks.nodeDrag.trigger({ event, node: n })
|
store.hooks.nodeDrag.trigger({ event, node: n })
|
||||||
|
|
||||||
store.updateNodePosDiff({
|
store.updateNodePosDiff({
|
||||||
@@ -117,7 +71,6 @@ const onDrag: DraggableEventListener = ({ event, data }) => {
|
|||||||
isDragging: true,
|
isDragging: true,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const onDragStop: DraggableEventListener = ({ event }) => {
|
const onDragStop: DraggableEventListener = ({ event }) => {
|
||||||
const n = props.node
|
const n = props.node
|
||||||
// onDragStop also gets called when user just clicks on a node.
|
// onDragStop also gets called when user just clicks on a node.
|
||||||
@@ -128,16 +81,12 @@ const onDragStop: DraggableEventListener = ({ event }) => {
|
|||||||
}
|
}
|
||||||
store.hooks.nodeClick.trigger({ event, node: n })
|
store.hooks.nodeClick.trigger({ event, node: n })
|
||||||
store.hooks.elementClick.trigger({ event, element: n })
|
store.hooks.elementClick.trigger({ event, element: n })
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
store.updateNodePosDiff({
|
store.updateNodePosDiff({
|
||||||
id: n.id,
|
id: n.id,
|
||||||
isDragging: false,
|
isDragging: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
emit('dragStop', { event, node: n })
|
|
||||||
store.hooks.nodeDragStop.trigger({ event, node: n })
|
store.hooks.nodeDragStop.trigger({ event, node: n })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,6 +130,7 @@ export default {
|
|||||||
:scale="props.scale"
|
:scale="props.scale"
|
||||||
:grid="props.snapGrid"
|
:grid="props.snapGrid"
|
||||||
:enable-user-select-hack="false"
|
:enable-user-select-hack="false"
|
||||||
|
v-bind="props.draggable"
|
||||||
@start="onDragStart"
|
@start="onDragStart"
|
||||||
@move="onDrag"
|
@move="onDrag"
|
||||||
@stop="onDragStop"
|
@stop="onDragStop"
|
||||||
|
|||||||
+2
-1
@@ -30,6 +30,7 @@ export interface NodeProps<T = any> {
|
|||||||
export type NodeComponent = Component<NodeProps> | DefineComponent<NodeProps, any, any, any, any> | string
|
export type NodeComponent = Component<NodeProps> | DefineComponent<NodeProps, any, any, any, any> | string
|
||||||
export type DefaultNodeTypes = { [key in 'input' | 'output' | 'default']: Component<NodeProps> }
|
export type DefaultNodeTypes = { [key in 'input' | 'output' | 'default']: Component<NodeProps> }
|
||||||
export type NodeTypes = (keyof DefaultNodeTypes | string)[]
|
export type NodeTypes = (keyof DefaultNodeTypes | string)[]
|
||||||
|
export type Draggable = Omit<DraggableOptions, 'scale' | 'grid' | 'enableUserSelectHack' | 'enableTransformFix'> | boolean
|
||||||
|
|
||||||
export interface Node<T = any> {
|
export interface Node<T = any> {
|
||||||
id: ElementId
|
id: ElementId
|
||||||
@@ -41,7 +42,7 @@ export interface Node<T = any> {
|
|||||||
targetPosition?: Position
|
targetPosition?: Position
|
||||||
sourcePosition?: Position
|
sourcePosition?: Position
|
||||||
isHidden?: boolean
|
isHidden?: boolean
|
||||||
draggable?: boolean
|
draggable?: Draggable
|
||||||
selectable?: boolean
|
selectable?: boolean
|
||||||
connectable?: boolean
|
connectable?: boolean
|
||||||
dragHandle?: string
|
dragHandle?: string
|
||||||
|
|||||||
Reference in New Issue
Block a user