fix(nodes): pass all required props to node components
This commit is contained in:
@@ -3,20 +3,19 @@ import { DraggableEventListener, DraggableCore } 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 } from '../../context'
|
import { NodeId } from '../../context'
|
||||||
import { getDimensions, getHandleBounds, getXYZPos } from '../../utils'
|
import { getXYZPos } from '../../utils'
|
||||||
|
|
||||||
interface NodeWrapperProps {
|
interface NodeWrapperProps {
|
||||||
node: GraphNode
|
node: GraphNode
|
||||||
|
type: NodeComponent
|
||||||
|
draggable: boolean
|
||||||
|
selectable: boolean
|
||||||
|
connectable: boolean
|
||||||
snapGrid?: SnapGrid
|
snapGrid?: SnapGrid
|
||||||
component?: NodeComponent
|
|
||||||
draggable?: boolean
|
|
||||||
selectable?: boolean
|
|
||||||
connectable?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = defineProps<NodeWrapperProps>()
|
const props = defineProps<NodeWrapperProps>()
|
||||||
const emit = defineEmits(['update:node'])
|
const node = useVModel(props, 'node')
|
||||||
const node = useVModel(props, 'node', emit)
|
|
||||||
const { id, store } = useVueFlow()
|
const { id, store } = useVueFlow()
|
||||||
provide(NodeId, props.node.id)
|
provide(NodeId, props.node.id)
|
||||||
|
|
||||||
@@ -139,13 +138,6 @@ export default {
|
|||||||
zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
|
zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
|
||||||
transform: `translate(${node.computedPosition.x}px,${node.computedPosition.y}px)`,
|
transform: `translate(${node.computedPosition.x}px,${node.computedPosition.y}px)`,
|
||||||
pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
|
pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
|
||||||
opacity:
|
|
||||||
store.dimensions.width !== 0 &&
|
|
||||||
store.dimensions.height !== 0 &&
|
|
||||||
node.dimensions.width !== 0 &&
|
|
||||||
node.dimensions.height !== 0
|
|
||||||
? 1
|
|
||||||
: 0,
|
|
||||||
...node.style,
|
...node.style,
|
||||||
}"
|
}"
|
||||||
:data-id="node.id"
|
:data-id="node.id"
|
||||||
@@ -158,17 +150,29 @@ export default {
|
|||||||
>
|
>
|
||||||
<slot
|
<slot
|
||||||
v-bind="{
|
v-bind="{
|
||||||
nodeElement,
|
...node,
|
||||||
connectable: props.connectable,
|
nodeElement,
|
||||||
...removeEmpty(node),
|
connectable: props.connectable,
|
||||||
|
draggable: props.draggable,
|
||||||
|
selectable: props.selectable,
|
||||||
|
zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
|
||||||
|
selected: !!node.selected,
|
||||||
|
hidden: !!node.hidden,
|
||||||
|
dragging: !!node.dragging,
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<component
|
<component
|
||||||
:is="props.component ?? node.type"
|
:is="props.type ?? node.type"
|
||||||
v-bind="{
|
v-bind="{
|
||||||
|
...node,
|
||||||
nodeElement,
|
nodeElement,
|
||||||
connectable: props.connectable,
|
connectable: props.connectable,
|
||||||
...removeEmpty(node),
|
draggable: props.draggable,
|
||||||
|
selectable: props.selectable,
|
||||||
|
zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
|
||||||
|
selected: !!node.selected,
|
||||||
|
hidden: !!node.hidden,
|
||||||
|
dragging: !!node.dragging,
|
||||||
}"
|
}"
|
||||||
/>
|
/>
|
||||||
</slot>
|
</slot>
|
||||||
|
|||||||
@@ -27,10 +27,10 @@ export default {
|
|||||||
v-for="node of store.getNodes"
|
v-for="node of store.getNodes"
|
||||||
:key="node.id"
|
:key="node.id"
|
||||||
:node="node"
|
:node="node"
|
||||||
:component="getType(node.type)"
|
:type="getType(node.type)"
|
||||||
:draggable="typeof node.draggable === 'undefined' ? store.nodesDraggable : node.draggable"
|
:draggable="typeof node.draggable === 'undefined' ? store.nodesDraggable : !!node.draggable"
|
||||||
:selectable="typeof node.selectable === 'undefined' ? store.elementsSelectable : node.selectable"
|
:selectable="typeof node.selectable === 'undefined' ? store.elementsSelectable : !!node.selectable"
|
||||||
:connectable="typeof node.connectable === 'undefined' ? store.nodesConnectable : node.connectable"
|
:connectable="typeof node.connectable === 'undefined' ? store.nodesConnectable : !!node.connectable"
|
||||||
:snap-grid="snapGrid(node)"
|
:snap-grid="snapGrid(node)"
|
||||||
>
|
>
|
||||||
<template #default="nodeProps">
|
<template #default="nodeProps">
|
||||||
|
|||||||
@@ -47,7 +47,9 @@ export default (state: State): ComputedGetters => {
|
|||||||
const getEdges = computed<GraphEdge[]>(() => {
|
const getEdges = computed<GraphEdge[]>(() => {
|
||||||
if (state.paneReady && state.dimensions.width && state.dimensions.height) {
|
if (state.paneReady && state.dimensions.width && state.dimensions.height) {
|
||||||
if (!state.onlyRenderVisibleElements)
|
if (!state.onlyRenderVisibleElements)
|
||||||
return state.edges.filter((e) => !e.hidden && !e.targetNode.hidden && !e.sourceNode.hidden)
|
return state.edges.filter(
|
||||||
|
(e) => !e.hidden && e.targetNode && !e.targetNode.hidden && e.sourceNode && !e.sourceNode.hidden,
|
||||||
|
)
|
||||||
else
|
else
|
||||||
return state.edges.filter(
|
return state.edges.filter(
|
||||||
(e) =>
|
(e) =>
|
||||||
|
|||||||
Reference in New Issue
Block a user