feat(edges): Use slot injection for custom edges
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
import { useHandle, useVueFlow } from '../../composables'
|
import { useHandle, useVueFlow } from '../../composables'
|
||||||
import { ConnectionMode, Position, EdgeComponent } from '../../types'
|
import { ConnectionMode, Position, EdgeComponent } from '../../types'
|
||||||
import { getEdgePositions, getHandle, getMarkerId } from '../../utils'
|
import { getEdgePositions, getHandle, getMarkerId } from '../../utils'
|
||||||
|
import { Slots } from '../../context'
|
||||||
import EdgeAnchor from './EdgeAnchor.vue'
|
import EdgeAnchor from './EdgeAnchor.vue'
|
||||||
|
|
||||||
interface EdgeWrapper {
|
interface EdgeWrapper {
|
||||||
@@ -98,18 +99,38 @@ onMounted(() => {
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const slots = inject(Slots)
|
||||||
|
|
||||||
const name = ref(edge.value.type ?? 'default')
|
const name = ref(edge.value.type ?? 'default')
|
||||||
|
watch(
|
||||||
|
() => edge.value.type,
|
||||||
|
(v) => v && (name.value = v),
|
||||||
|
)
|
||||||
|
|
||||||
const type = computed(() => {
|
const type = computed(() => {
|
||||||
|
const instance = getCurrentInstance()
|
||||||
let edgeType = store.getEdgeTypes[name.value]
|
let edgeType = store.getEdgeTypes[name.value]
|
||||||
if (typeof edgeType === 'string') edgeType = resolveComponent(name.value, false) as EdgeComponent
|
if (typeof edgeType === 'string') {
|
||||||
|
if (instance) {
|
||||||
|
const components = Object.keys(instance.appContext.components)
|
||||||
|
if (components && components.includes(name.value)) {
|
||||||
|
edgeType = resolveComponent(name.value, false) as EdgeComponent
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (typeof edgeType !== 'string') return edgeType
|
if (typeof edgeType !== 'string') return edgeType
|
||||||
|
|
||||||
const slot = useSlots()?.[name.value]?.({})
|
const slot = slots?.[`edge-${name.value}`]?.({})
|
||||||
if (!slot || !slot[0].key?.toString().includes(name.value)) {
|
if (!slot) {
|
||||||
console.warn(`Node type "${edge.value.type}" not found and no slot detected. Using fallback type "default".`)
|
console.warn(`[vueflow]: Edge type "${edge.value.type}" not found and no edge-slot detected. Using fallback type "default".`)
|
||||||
name.value = 'default'
|
name.value = 'default'
|
||||||
return store.getEdgeTypes.default
|
return store.getEdgeTypes.default
|
||||||
}
|
}
|
||||||
|
if (slot.length > 1) {
|
||||||
|
console.warn('[vue-flow]: More than one element in edge-slot detected. Using fallback to first slot item.')
|
||||||
|
}
|
||||||
|
|
||||||
|
return slot[0]
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
@@ -139,16 +160,17 @@ export default {
|
|||||||
@mousemove="onEdgeMouseMove"
|
@mousemove="onEdgeMouseMove"
|
||||||
@mouseleave="onEdgeMouseLeave"
|
@mouseleave="onEdgeMouseLeave"
|
||||||
>
|
>
|
||||||
<slot
|
<component
|
||||||
|
:is="type"
|
||||||
v-bind="{
|
v-bind="{
|
||||||
id: edge.id,
|
id: edge.id,
|
||||||
sourceNode: edge.sourceNode,
|
sourceNode: edge.sourceNode,
|
||||||
targetNode: edge.targetNode,
|
targetNode: edge.targetNode,
|
||||||
source: edge.source,
|
source: edge.source,
|
||||||
target: edge.target,
|
target: edge.target,
|
||||||
|
updatable: props.updatable,
|
||||||
selected: edge.selected,
|
selected: edge.selected,
|
||||||
animated: edge.animated,
|
animated: edge.animated,
|
||||||
updatable: props.updatable,
|
|
||||||
label: edge.label,
|
label: edge.label,
|
||||||
labelStyle: edge.labelStyle,
|
labelStyle: edge.labelStyle,
|
||||||
labelShowBg: edge.labelShowBg,
|
labelShowBg: edge.labelShowBg,
|
||||||
@@ -157,51 +179,18 @@ export default {
|
|||||||
labelBgBorderRadius: edge.labelBgBorderRadius,
|
labelBgBorderRadius: edge.labelBgBorderRadius,
|
||||||
data: edge.data,
|
data: edge.data,
|
||||||
style: edge.style,
|
style: edge.style,
|
||||||
sourceX: edge.sourceX,
|
|
||||||
sourceY: edge.sourceY,
|
|
||||||
targetX: edge.targetX,
|
|
||||||
targetY: edge.targetY,
|
|
||||||
markerStart: `url(#${getMarkerId(edge.markerStart)})`,
|
markerStart: `url(#${getMarkerId(edge.markerStart)})`,
|
||||||
markerEnd: `url(#${getMarkerId(edge.markerEnd)})`,
|
markerEnd: `url(#${getMarkerId(edge.markerEnd)})`,
|
||||||
sourcePosition,
|
sourcePosition,
|
||||||
targetPosition,
|
targetPosition,
|
||||||
|
sourceX: edge.sourceX,
|
||||||
|
sourceY: edge.sourceY,
|
||||||
|
targetX: edge.targetX,
|
||||||
|
targetY: edge.targetY,
|
||||||
sourceHandleId: edge.sourceHandle,
|
sourceHandleId: edge.sourceHandle,
|
||||||
targetHandleId: edge.targetHandle,
|
targetHandleId: edge.targetHandle,
|
||||||
}"
|
}"
|
||||||
>
|
/>
|
||||||
<component
|
|
||||||
:is="type"
|
|
||||||
v-if="type"
|
|
||||||
v-bind="{
|
|
||||||
id: edge.id,
|
|
||||||
sourceNode: edge.sourceNode,
|
|
||||||
targetNode: edge.targetNode,
|
|
||||||
source: edge.source,
|
|
||||||
target: edge.target,
|
|
||||||
updatable: props.updatable,
|
|
||||||
selected: edge.selected,
|
|
||||||
animated: edge.animated,
|
|
||||||
label: edge.label,
|
|
||||||
labelStyle: edge.labelStyle,
|
|
||||||
labelShowBg: edge.labelShowBg,
|
|
||||||
labelBgStyle: edge.labelBgStyle,
|
|
||||||
labelBgPadding: edge.labelBgPadding,
|
|
||||||
labelBgBorderRadius: edge.labelBgBorderRadius,
|
|
||||||
data: edge.data,
|
|
||||||
style: edge.style,
|
|
||||||
markerStart: `url(#${getMarkerId(edge.markerStart)})`,
|
|
||||||
markerEnd: `url(#${getMarkerId(edge.markerEnd)})`,
|
|
||||||
sourcePosition,
|
|
||||||
targetPosition,
|
|
||||||
sourceX: edge.sourceX,
|
|
||||||
sourceY: edge.sourceY,
|
|
||||||
targetX: edge.targetX,
|
|
||||||
targetY: edge.targetY,
|
|
||||||
sourceHandleId: edge.sourceHandle,
|
|
||||||
targetHandleId: edge.targetHandle,
|
|
||||||
}"
|
|
||||||
/>
|
|
||||||
</slot>
|
|
||||||
<g
|
<g
|
||||||
v-if="props.updatable"
|
v-if="props.updatable"
|
||||||
@mousedown="onEdgeUpdaterSourceMouseDown"
|
@mousedown="onEdgeUpdaterSourceMouseDown"
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ const type = computed(() => {
|
|||||||
return store.getNodeTypes.default
|
return store.getNodeTypes.default
|
||||||
}
|
}
|
||||||
if (slot.length > 1) {
|
if (slot.length > 1) {
|
||||||
console.warn('[vue-flow]: More than one element in node-slots detected. Using fallback to first slot item.')
|
console.warn('[vue-flow]: More than one element in node-slot detected. Using fallback to first slot item.')
|
||||||
}
|
}
|
||||||
|
|
||||||
return slot[0]
|
return slot[0]
|
||||||
@@ -189,7 +189,6 @@ export default {
|
|||||||
>
|
>
|
||||||
<component
|
<component
|
||||||
:is="type"
|
:is="type"
|
||||||
v-if="type"
|
|
||||||
v-bind="{
|
v-bind="{
|
||||||
nodeElement,
|
nodeElement,
|
||||||
id: node.id,
|
id: node.id,
|
||||||
|
|||||||
@@ -47,11 +47,7 @@ export default {
|
|||||||
:key="edge.id"
|
:key="edge.id"
|
||||||
:selectable="typeof edge.selectable === 'undefined' ? store.elementsSelectable : edge.selectable"
|
:selectable="typeof edge.selectable === 'undefined' ? store.elementsSelectable : edge.selectable"
|
||||||
:updatable="typeof edge.updatable === 'undefined' ? store.edgesUpdatable : edge.updatable"
|
:updatable="typeof edge.updatable === 'undefined' ? store.edgesUpdatable : edge.updatable"
|
||||||
>
|
/>
|
||||||
<template #default="edgeProps">
|
|
||||||
<slot v-if="edge.type" :name="`edge-${edge.type}`" v-bind="edgeProps"></slot>
|
|
||||||
</template>
|
|
||||||
</EdgeWrapper>
|
|
||||||
<ConnectionLine v-if="connectionLineVisible && sourceNode" :source-node="sourceNode" />
|
<ConnectionLine v-if="connectionLineVisible && sourceNode" :source-node="sourceNode" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
@@ -19,10 +19,6 @@ export default {
|
|||||||
: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="node.snapGrid ?? (store.snapToGrid ? store.snapGrid : undefined)"
|
:snap-grid="node.snapGrid ?? (store.snapToGrid ? store.snapGrid : undefined)"
|
||||||
>
|
/>
|
||||||
<template #default="nodeProps">
|
|
||||||
<slot v-if="node.type" :name="`node-${node.type}`" v-bind="nodeProps"></slot>
|
|
||||||
</template>
|
|
||||||
</NodeWrapper>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export { default as StepEdge } from './components/Edges/StepEdge.vue'
|
|||||||
export { default as BezierEdge } from './components/Edges/BezierEdge.vue'
|
export { default as BezierEdge } from './components/Edges/BezierEdge.vue'
|
||||||
export { default as SimpleBezierEdge } from './components/Edges/SimpleBezierEdge.vue'
|
export { default as SimpleBezierEdge } from './components/Edges/SimpleBezierEdge.vue'
|
||||||
export { default as SmoothStepEdge } from './components/Edges/SmoothStepEdge.vue'
|
export { default as SmoothStepEdge } from './components/Edges/SmoothStepEdge.vue'
|
||||||
|
|
||||||
export {
|
export {
|
||||||
getBezierPath,
|
getBezierPath,
|
||||||
getBezierCenter,
|
getBezierCenter,
|
||||||
@@ -29,11 +30,13 @@ export {
|
|||||||
getNodesInside,
|
getNodesInside,
|
||||||
getMarkerId,
|
getMarkerId,
|
||||||
} from './utils/graph'
|
} from './utils/graph'
|
||||||
|
|
||||||
export { defaultEdgeTypes, defaultNodeTypes } from './store'
|
export { defaultEdgeTypes, defaultNodeTypes } from './store'
|
||||||
|
export { VueFlow as VueFlowInjection, NodeId as NodeIdInjection } from './context'
|
||||||
|
|
||||||
export { default as useZoomPanHelper } from './composables/useZoomPanHelper'
|
export { default as useZoomPanHelper } from './composables/useZoomPanHelper'
|
||||||
export { default as useVueFlow } from './composables/useVueFlow'
|
export { default as useVueFlow } from './composables/useVueFlow'
|
||||||
export { default as useHandle } from './composables/useHandle'
|
export { default as useHandle } from './composables/useHandle'
|
||||||
|
|
||||||
export * from './additional-components'
|
export * from './additional-components'
|
||||||
export * from './types'
|
export * from './types'
|
||||||
export * from './context'
|
|
||||||
|
|||||||
Reference in New Issue
Block a user