refactor(edges): edges z-index 0 by default
# What's changed? * only group edges by z-index when `elevateEdgesOnSelect` is true * add `elevateEdgesOnSelect` option
This commit is contained in:
@@ -22,13 +22,14 @@ const {
|
|||||||
edgesUpdatable,
|
edgesUpdatable,
|
||||||
elementsSelectable,
|
elementsSelectable,
|
||||||
getSelectedNodes,
|
getSelectedNodes,
|
||||||
|
nodesSelectionActive,
|
||||||
getNode,
|
getNode,
|
||||||
getNodes,
|
getNodes,
|
||||||
getEdges,
|
getEdges,
|
||||||
getEdgeTypes,
|
getEdgeTypes,
|
||||||
setState,
|
|
||||||
addSelectedEdges,
|
addSelectedEdges,
|
||||||
noPanClassName,
|
noPanClassName,
|
||||||
|
elevateEdgesOnSelect,
|
||||||
} = $(useVueFlow())
|
} = $(useVueFlow())
|
||||||
|
|
||||||
const selectable = (s?: boolean) => (typeof s === 'undefined' ? elementsSelectable : s)
|
const selectable = (s?: boolean) => (typeof s === 'undefined' ? elementsSelectable : s)
|
||||||
@@ -57,16 +58,22 @@ const connectionLineVisible = $(
|
|||||||
let groups = $ref<ReturnType<typeof groupEdgesByZLevel>>([])
|
let groups = $ref<ReturnType<typeof groupEdgesByZLevel>>([])
|
||||||
|
|
||||||
onPaneReady(() => {
|
onPaneReady(() => {
|
||||||
watch(
|
const stop = watch(
|
||||||
[$$(getSelectedNodes), $$(getEdges), $$(getNodes)],
|
[$$(elevateEdgesOnSelect), $$(getSelectedNodes), $$(getEdges), $$(getNodes)],
|
||||||
() => {
|
() => {
|
||||||
|
if (elevateEdgesOnSelect) {
|
||||||
nextTick(() => (groups = groupEdgesByZLevel(getEdges, getNode)))
|
nextTick(() => (groups = groupEdgesByZLevel(getEdges, getNode)))
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
flush: 'post',
|
flush: 'post',
|
||||||
immediate: true,
|
immediate: true,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
stop()
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
const getType = (type?: string, template?: GraphEdge['template']) => {
|
const getType = (type?: string, template?: GraphEdge['template']) => {
|
||||||
@@ -96,9 +103,7 @@ const getType = (type?: string, template?: GraphEdge['template']) => {
|
|||||||
const onEdgeClick = (event: MouseEvent, edge: GraphEdge) => {
|
const onEdgeClick = (event: MouseEvent, edge: GraphEdge) => {
|
||||||
const data = { event, edge }
|
const data = { event, edge }
|
||||||
if (selectable(edge.selectable)) {
|
if (selectable(edge.selectable)) {
|
||||||
setState({
|
$$(nodesSelectionActive).value = false
|
||||||
nodesSelectionActive: false,
|
|
||||||
})
|
|
||||||
|
|
||||||
addSelectedEdges([edge])
|
addSelectedEdges([edge])
|
||||||
}
|
}
|
||||||
@@ -156,7 +161,13 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<svg v-for="group of groups" :key="group.level" class="vue-flow__edges vue-flow__container" :style="`z-index: ${group.level}`">
|
<template v-if="elevateEdgesOnSelect">
|
||||||
|
<svg
|
||||||
|
v-for="group of groups"
|
||||||
|
:key="group.level"
|
||||||
|
class="vue-flow__edges vue-flow__container"
|
||||||
|
:style="`z-index: ${group.level}`"
|
||||||
|
>
|
||||||
<MarkerDefinitions v-if="group.isMaxLevel" :default-color="defaultMarkerColor" />
|
<MarkerDefinitions v-if="group.isMaxLevel" :default-color="defaultMarkerColor" />
|
||||||
<g>
|
<g>
|
||||||
<EdgeWrapper
|
<EdgeWrapper
|
||||||
@@ -188,17 +199,63 @@ export default {
|
|||||||
:marker-start="edge.markerStart"
|
:marker-start="edge.markerStart"
|
||||||
:style="getStyle(edge)"
|
:style="getStyle(edge)"
|
||||||
:class="getClass(edge)"
|
:class="getClass(edge)"
|
||||||
@click="(e: MouseEvent) => onEdgeClick(e, edge)"
|
@click="onEdgeClick($event, edge)"
|
||||||
@dbl-click="(e: MouseEvent) => onDoubleClick(e, edge)"
|
@dbl-click="onDoubleClick($event, edge)"
|
||||||
@contextmenu="(e: MouseEvent) => onEdgeContextMenu(e, edge)"
|
@contextmenu="onEdgeContextMenu($event, edge)"
|
||||||
@mouseenter="(e: MouseEvent) => onEdgeMouseEnter(e, edge)"
|
@mouseenter="onEdgeMouseEnter($event, edge)"
|
||||||
@mousemove="(e: MouseEvent) => onEdgeMouseMove(e, edge)"
|
@mousemove="onEdgeMouseMove($event, edge)"
|
||||||
@mouseleave="(e: MouseEvent) => onEdgeMouseLeave(e, edge)"
|
@mouseleave="onEdgeMouseLeave($event, edge)"
|
||||||
@source-mousedown="(e: MouseEvent) => onEdgeUpdaterSourceMouseDown(e, edge)"
|
@source-mousedown="onEdgeUpdaterSourceMouseDown($event, edge)"
|
||||||
@target-mousedown="(e: MouseEvent) => onEdgeUpdaterTargetMouseDown(e, edge)"
|
@target-mousedown="onEdgeUpdaterTargetMouseDown($event, edge)"
|
||||||
/>
|
/>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<svg class="vue-flow__edges vue-flow__container">
|
||||||
|
<MarkerDefinitions :default-color="defaultMarkerColor" />
|
||||||
|
<g>
|
||||||
|
<EdgeWrapper
|
||||||
|
v-for="edge of getEdges"
|
||||||
|
:id="edge.id"
|
||||||
|
:key="edge.id"
|
||||||
|
:type="getType(edge.type, edge.template)"
|
||||||
|
:name="edge.type || 'default'"
|
||||||
|
:source="edge.source"
|
||||||
|
:target="edge.target"
|
||||||
|
:target-handle-id="edge.targetHandle"
|
||||||
|
:source-handle-id="edge.sourceHandle"
|
||||||
|
:source-node="getNode(edge.source)"
|
||||||
|
:target-node="getNode(edge.target)"
|
||||||
|
:label="edge.label"
|
||||||
|
:data="edge.data"
|
||||||
|
:animated="edge.animated"
|
||||||
|
:selectable="selectable(edge.selectable)"
|
||||||
|
:selected="edge.selected"
|
||||||
|
:updatable="updatable(edge.updatable)"
|
||||||
|
:label-style="edge.labelStyle"
|
||||||
|
:label-show-bg="edge.labelShowBg"
|
||||||
|
:label-bg-style="edge.labelBgStyle"
|
||||||
|
:label-bg-padding="edge.labelBgPadding"
|
||||||
|
:label-bg-border-radius="edge.labelBgBorderRadius"
|
||||||
|
:connection-mode="connectionMode"
|
||||||
|
:edge-updater-radius="edgeUpdaterRadius"
|
||||||
|
:marker-end="edge.markerEnd"
|
||||||
|
:marker-start="edge.markerStart"
|
||||||
|
:style="getStyle(edge)"
|
||||||
|
:class="getClass(edge)"
|
||||||
|
@click="onEdgeClick($event, edge)"
|
||||||
|
@dbl-click="onDoubleClick($event, edge)"
|
||||||
|
@contextmenu="onEdgeContextMenu($event, edge)"
|
||||||
|
@mouseenter="onEdgeMouseEnter($event, edge)"
|
||||||
|
@mousemove="onEdgeMouseMove($event, edge)"
|
||||||
|
@mouseleave="onEdgeMouseLeave($event, edge)"
|
||||||
|
@source-mousedown="onEdgeUpdaterSourceMouseDown($event, edge)"
|
||||||
|
@target-mousedown="onEdgeUpdaterTargetMouseDown($event, edge)"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</template>
|
||||||
<svg v-if="connectionLineVisible && !!sourceNode" class="vue-flow__edges vue-flow__connectionline vue-flow__container">
|
<svg v-if="connectionLineVisible && !!sourceNode" class="vue-flow__edges vue-flow__connectionline vue-flow__container">
|
||||||
<ConnectionLine :source-node="sourceNode" />
|
<ConnectionLine :source-node="sourceNode" />
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ const props = withDefaults(defineProps<FlowProps>(), {
|
|||||||
connectOnClick: undefined,
|
connectOnClick: undefined,
|
||||||
connectionLineStyle: undefined,
|
connectionLineStyle: undefined,
|
||||||
autoConnect: undefined,
|
autoConnect: undefined,
|
||||||
|
elevateEdgesOnSelect: undefined,
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ const defaultState = (): State => ({
|
|||||||
noWheelClassName: 'nowheel',
|
noWheelClassName: 'nowheel',
|
||||||
noPanClassName: 'nopan',
|
noPanClassName: 'nopan',
|
||||||
defaultEdgeOptions: undefined,
|
defaultEdgeOptions: undefined,
|
||||||
|
elevateEdgesOnSelect: false,
|
||||||
|
|
||||||
vueFlowVersion: typeof __VUE_FLOW_VERSION__ !== 'undefined' ? __VUE_FLOW_VERSION__ : '-',
|
vueFlowVersion: typeof __VUE_FLOW_VERSION__ !== 'undefined' ? __VUE_FLOW_VERSION__ : '-',
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -129,6 +129,8 @@ export interface FlowProps {
|
|||||||
noPanClassName?: string
|
noPanClassName?: string
|
||||||
/** does not work for the `addEdge` utility! */
|
/** does not work for the `addEdge` utility! */
|
||||||
defaultEdgeOptions?: DefaultEdgeOptions
|
defaultEdgeOptions?: DefaultEdgeOptions
|
||||||
|
/** elevates edges when selected and applies z-Index to put them above their nodes */
|
||||||
|
elevateEdgesOnSelect?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FlowOptions = FlowProps
|
export type FlowOptions = FlowProps
|
||||||
|
|||||||
Reference in New Issue
Block a user