refactor: change prop types for NodeWrapper

* don't split node prop into smaller ones

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
Braks
2021-11-22 17:33:12 +01:00
parent f86033c1e8
commit c7dca2cbd0
2 changed files with 24 additions and 45 deletions
+24 -35
View File
@@ -1,29 +1,18 @@
<script lang="ts" setup> <script lang="ts" setup>
import { CSSProperties } from 'vue'
import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable' import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable'
import { useStore } from '../../composables' import { useStore } from '../../composables'
import { ElementId, FlowEvents, GraphNode, Position, SnapGrid, VFInternals, XYPosition } from '../../types' import { FlowEvents, GraphNode, SnapGrid, VFInternals } from '../../types'
import { NodeId } from '../../context' import { NodeId } from '../../context'
interface NodeWrapperProps { interface NodeWrapperProps {
id: ElementId
position: XYPosition
node: GraphNode node: GraphNode
vf: VFInternals vf: VFInternals
selectNodesOnDrag?: boolean selectNodesOnDrag?: boolean
snapGrid?: SnapGrid snapGrid?: SnapGrid
type?: string
component?: any component?: any
class?: string
style?: CSSProperties
data?: any
targetPosition?: Position
sourcePosition?: Position
isHidden?: boolean
draggable?: boolean draggable?: boolean
selectable?: boolean selectable?: boolean
connectable?: boolean connectable?: boolean
dragHandle?: string
scale?: number scale?: number
} }
@@ -43,11 +32,11 @@ const props = defineProps<NodeWrapperProps>()
const emit = defineEmits<NodeEvents>() const emit = defineEmits<NodeEvents>()
const store = useStore() const store = useStore()
provide(NodeId, props.id) provide(NodeId, props.node.id)
const nodeElement = templateRef<HTMLDivElement>('node-element', null) const nodeElement = templateRef<HTMLDivElement>('node-element', null)
const selected = computed(() => props.selectable && store.selectedElements?.some(({ id }) => id === props.id)) const selected = computed(() => props.selectable && store.selectedElements?.some(({ id }) => id === props.node.id))
const onMouseEnterHandler = () => const onMouseEnterHandler = () =>
props.vf.isDragging && props.vf.isDragging &&
@@ -120,7 +109,7 @@ const onDrag: DraggableEventListener = ({ event, data }) => {
store.hooks.nodeDrag.trigger({ event, node: n }) store.hooks.nodeDrag.trigger({ event, node: n })
store.updateNodePosDiff({ store.updateNodePosDiff({
id: props.id, id: props.node.id,
diff: { diff: {
x: data.deltaX, x: data.deltaX,
y: data.deltaY, y: data.deltaY,
@@ -154,7 +143,7 @@ const onDragStop: DraggableEventListener = ({ event }) => {
onMounted(() => { onMounted(() => {
store.updateNodeDimensions({ store.updateNodeDimensions({
id: props.id, id: props.node.id,
nodeElement: nodeElement.value, nodeElement: nodeElement.value,
forceUpdate: true, forceUpdate: true,
}) })
@@ -168,10 +157,10 @@ onMounted(() => {
}), }),
) )
watch([() => props.type, () => props.sourcePosition, () => props.targetPosition], () => { watch([() => props.node.type, () => props.node.sourcePosition, () => props.node.targetPosition], () => {
nextTick(() => { nextTick(() => {
store.updateNodeDimensions({ store.updateNodeDimensions({
id: props.id, id: props.node.id,
nodeElement: nodeElement.value, nodeElement: nodeElement.value,
forceUpdate: true, forceUpdate: true,
}) })
@@ -187,8 +176,8 @@ export default {
<template> <template>
<DraggableCore <DraggableCore
cancel=".nodrag" cancel=".nodrag"
:handle="props.dragHandle" :handle="props.node.dragHandle"
:disabled="!draggable" :disabled="!props.draggable"
:scale="props.scale" :scale="props.scale"
:grid="props.snapGrid" :grid="props.snapGrid"
:enable-user-select-hack="false" :enable-user-select-hack="false"
@@ -200,21 +189,21 @@ export default {
ref="node-element" ref="node-element"
:class="[ :class="[
'vue-flow__node', 'vue-flow__node',
`vue-flow__node-${props.type}`, `vue-flow__node-${props.node.type}`,
{ {
selected, selected,
selectable: props.selectable, selectable: props.selectable,
}, },
props.class, props.node.class,
]" ]"
:style="{ :style="{
zIndex: selected ? 10 : 3, zIndex: selected ? 10 : 3,
transform: `translate(${props.vf.position.x}px,${props.vf.position.y}px)`, transform: `translate(${props.vf.position.x}px,${props.vf.position.y}px)`,
pointerEvents: props.selectable || props.draggable ? 'all' : 'none', pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
opacity: props.vf.width !== null && props.vf.height !== null ? 1 : 0, opacity: props.vf.width !== null && props.vf.height !== null ? 1 : 0,
...props.style, ...props.node.style,
}" }"
:data-id="props.id" :data-id="props.node.id"
@mouseenter="onMouseEnterHandler" @mouseenter="onMouseEnterHandler"
@mousemove="onMouseMoveHandler" @mousemove="onMouseMoveHandler"
@mouseleave="onMouseLeaveHandler" @mouseleave="onMouseLeaveHandler"
@@ -224,30 +213,30 @@ export default {
> >
<slot <slot
v-bind="{ v-bind="{
id: props.id, id: props.node.id,
data: props.data, data: props.node.data,
type: props.type, type: props.node.type,
xPos: props.vf.position.x, xPos: props.vf.position.x,
yPos: props.vf.position.y, yPos: props.vf.position.y,
selected, selected,
connectable: props.connectable, connectable: props.connectable,
sourcePosition: props.sourcePosition, sourcePosition: props.node.sourcePosition,
targetPosition: props.targetPosition, targetPosition: props.node.targetPosition,
dragging: props.vf.isDragging, dragging: props.vf.isDragging,
}" }"
> >
<component <component
:is="props.component ?? props.type" :is="props.component ?? props.node.type"
v-bind="{ v-bind="{
id: props.id, id: props.node.id,
data: props.data, data: props.node.data,
type: props.type, type: props.node.type,
xPos: props.vf.position.x, xPos: props.vf.position.x,
yPos: props.vf.position.y, yPos: props.vf.position.y,
selected, selected,
connectable: props.connectable, connectable: props.connectable,
sourcePosition: props.sourcePosition, sourcePosition: props.node.sourcePosition,
targetPosition: props.targetPosition, targetPosition: props.node.targetPosition,
dragging: props.vf.isDragging, dragging: props.vf.isDragging,
}" }"
/> />
@@ -45,23 +45,13 @@ export default {
<div class="vue-flow__nodes" :style="{ transform }"> <div class="vue-flow__nodes" :style="{ transform }">
<NodeWrapper <NodeWrapper
v-for="(node, i) of props.nodes" v-for="(node, i) of props.nodes"
:id="node.id"
:key="`${node.id}-${i}`" :key="`${node.id}-${i}`"
:node="node" :node="node"
:vf="node.__vf" :vf="node.__vf"
:position="node.position"
:type="node.type"
:component="getType(node.type)" :component="getType(node.type)"
:class="node.class"
:style="node.style"
:data="node.data"
:target-position="node.targetPosition"
:source-position="node.sourcePosition"
:is-hidden="node.isHidden"
:draggable="typeof node.draggable === 'undefined' ? props.elementsSelectable : node.draggable" :draggable="typeof node.draggable === 'undefined' ? props.elementsSelectable : node.draggable"
:selectable="typeof node.selectable === 'undefined' ? props.elementsSelectable : node.selectable" :selectable="typeof node.selectable === 'undefined' ? props.elementsSelectable : node.selectable"
:connectable="typeof node.connectable === 'undefined' ? props.elementsSelectable : node.connectable" :connectable="typeof node.connectable === 'undefined' ? props.elementsSelectable : node.connectable"
:drag-handle="node.dragHandle"
:snap-grid="snapGrid" :snap-grid="snapGrid"
:select-nodes-on-drag="props.selectNodesOnDrag" :select-nodes-on-drag="props.selectNodesOnDrag"
:scale="props.transform[2]" :scale="props.transform[2]"