refactor(edges): defer grouping to next tick

This commit is contained in:
Braks
2022-04-24 13:34:22 +02:00
parent f5d245322b
commit e2fd3b44ef
7 changed files with 82 additions and 59 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ export default defineConfig({
}, },
plugins: [ plugins: [
vue({ vue({
reactivityTransform: true, reactivityTransform: './src/',
}), }),
vueTypes(), vueTypes(),
svgLoader(), svgLoader(),
+28 -11
View File
@@ -1,27 +1,28 @@
<script lang="ts" setup> <script lang="ts" setup>
import { CSSProperties } from 'vue' import { CSSProperties } from 'vue'
import { useHandle, useVueFlow } from '../../composables' import { useHandle, useVueFlow } from '../../composables'
import { ConnectionMode, EdgeComponent, GraphEdge, GraphNode, Position } from '../../types' import { ConnectionMode, EdgeComponent, GraphEdge, Position } from '../../types'
import { getEdgePositions, getHandle, getMarkerId } from '../../utils' import { getEdgePositions, getHandle, getMarkerId } from '../../utils'
import EdgeAnchor from './EdgeAnchor' import EdgeAnchor from './EdgeAnchor'
interface EdgeWrapper { interface EdgeWrapper {
id: string id: string
edge: GraphEdge edge: GraphEdge
sourceNode: GraphNode
targetNode: GraphNode
selectable?: boolean selectable?: boolean
updatable?: boolean updatable?: boolean
type: EdgeComponent | Function | Object | false type: EdgeComponent | Function | Object | false
name: string name: string
} }
const { id, edge, name, sourceNode, targetNode, selectable, updatable, type } = defineProps<EdgeWrapper>() const { id, edge, name, selectable, updatable, type } = defineProps<EdgeWrapper>()
const { emits, connectionMode, edgeUpdaterRadius, noPanClassName, setState, getEdge, addSelectedEdges } = $(useVueFlow()) const { emits, connectionMode, edgeUpdaterRadius, noPanClassName, setState, getEdge, getNode, addSelectedEdges } = $(useVueFlow())
let updating = $ref(false) let updating = $ref(false)
const sourceNode = $computed(() => getNode(edge.source)!)
const targetNode = $computed(() => getNode(edge.target)!)
const { onMouseDown } = useHandle() const { onMouseDown } = useHandle()
const onEdgeClick = (event: MouseEvent) => { const onEdgeClick = (event: MouseEvent) => {
@@ -72,7 +73,12 @@ const handleEdgeUpdater = (event: MouseEvent, isSourceHandle: boolean) => {
) )
} }
const sourceHandle = $computed(() => { const sourceHandle = $(
controlledComputed(
() => sourceNode,
() => {
if (!sourceNode) return
let sourceNodeHandles let sourceNodeHandles
if (connectionMode === ConnectionMode.Strict) { if (connectionMode === ConnectionMode.Strict) {
sourceNodeHandles = sourceNode.handleBounds.source sourceNodeHandles = sourceNode.handleBounds.source
@@ -81,9 +87,16 @@ const sourceHandle = $computed(() => {
} }
return getHandle(sourceNodeHandles, edge.sourceHandle) return getHandle(sourceNodeHandles, edge.sourceHandle)
}) },
),
)
const targetHandle = $(
controlledComputed(
() => targetNode,
() => {
if (!targetNode) return
const targetHandle = $computed(() => {
let targetNodeHandles let targetNodeHandles
if (connectionMode === ConnectionMode.Strict) { if (connectionMode === ConnectionMode.Strict) {
targetNodeHandles = targetNode.handleBounds.target targetNodeHandles = targetNode.handleBounds.target
@@ -92,14 +105,16 @@ const targetHandle = $computed(() => {
} }
return getHandle(targetNodeHandles, edge.targetHandle) return getHandle(targetNodeHandles, edge.targetHandle)
}) },
),
)
const sourcePosition = $(controlledComputed($$(sourceHandle), () => (sourceHandle ? sourceHandle.position : Position.Bottom))) const sourcePosition = $(controlledComputed($$(sourceHandle), () => (sourceHandle ? sourceHandle.position : Position.Bottom)))
const targetPosition = $(controlledComputed($$(targetHandle), () => (targetHandle ? targetHandle.position : Position.Top))) const targetPosition = $(controlledComputed($$(targetHandle), () => (targetHandle ? targetHandle.position : Position.Top)))
onMounted(() => { onMounted(() => {
watch( const stop = watch(
[ [
$$(sourcePosition), $$(sourcePosition),
$$(targetPosition), $$(targetPosition),
@@ -124,8 +139,10 @@ onMounted(() => {
if (edge.targetX !== targetX) storedEdge.targetX = targetX if (edge.targetX !== targetX) storedEdge.targetX = targetX
if (edge.targetY !== targetY) storedEdge.targetY = targetY if (edge.targetY !== targetY) storedEdge.targetY = targetY
}, },
{ immediate: true, flush: 'post' }, { immediate: true, flush: 'pre' },
) )
onBeforeUnmount(() => stop())
}) })
const getClass = () => { const getClass = () => {
@@ -10,13 +10,16 @@ import MarkerDefinitions from './MarkerDefinitions.vue'
const slots = inject(Slots) const slots = inject(Slots)
const { const {
onPaneReady,
connectionNodeId, connectionNodeId,
nodesConnectable, nodesConnectable,
connectionHandleType, connectionHandleType,
defaultMarkerColor, defaultMarkerColor,
edgesUpdatable, edgesUpdatable,
elementsSelectable, elementsSelectable,
getSelectedNodes,
getNode, getNode,
getNodes,
getEdges, getEdges,
getEdgeTypes, getEdgeTypes,
} = $(useVueFlow()) } = $(useVueFlow())
@@ -44,11 +47,22 @@ const connectionLineVisible = $(
), ),
) )
const getNodeWrapped = (node: string) => getNode(node)! let groups = $ref<ReturnType<typeof groupEdgesByZLevel>>([])
const groups = computed(() => groupEdgesByZLevel(getEdges, getNodeWrapped)) onPaneReady(() => {
watch(
[$$(getSelectedNodes), $$(getEdges), $$(getNodes)],
() => {
nextTick(() => (groups = groupEdgesByZLevel(getEdges, getNode)))
},
{
flush: 'post',
immediate: true,
},
)
})
const getType = $computed(() => (edge: GraphEdge) => { const getType = (edge: GraphEdge) => {
const name = edge.type || 'default' const name = edge.type || 'default'
let edgeType = edge.template ?? getEdgeTypes[name] let edgeType = edge.template ?? getEdgeTypes[name]
const instance = getCurrentInstance() const instance = getCurrentInstance()
@@ -70,7 +84,7 @@ const getType = $computed(() => (edge: GraphEdge) => {
} }
return slot return slot
}) }
</script> </script>
<script lang="ts"> <script lang="ts">
export default { export default {
@@ -88,8 +102,6 @@ export default {
:edge="edge" :edge="edge"
:name="getType(edge) ? edge.type ?? 'default' : 'default'" :name="getType(edge) ? edge.type ?? 'default' : 'default'"
:type="getType(edge)" :type="getType(edge)"
:source-node="getNodeWrapped(edge.source)"
:target-node="getNodeWrapped(edge.target)"
:selectable="typeof edge.selectable === 'undefined' ? elementsSelectable : edge.selectable" :selectable="typeof edge.selectable === 'undefined' ? elementsSelectable : edge.selectable"
:updatable="typeof edge.updatable === 'undefined' ? edgesUpdatable : edge.updatable" :updatable="typeof edge.updatable === 'undefined' ? edgesUpdatable : edge.updatable"
/> />
@@ -23,8 +23,7 @@ const selectable = (s?: boolean) => (typeof s === 'undefined' ? elementsSelectab
const connectable = (c?: boolean) => (typeof c === 'undefined' ? nodesConnectable : c) const connectable = (c?: boolean) => (typeof c === 'undefined' ? nodesConnectable : c)
const hasSnapGrid = (sg?: SnapGrid) => (sg ?? snapToGrid ? snapGrid : undefined) const hasSnapGrid = (sg?: SnapGrid) => (sg ?? snapToGrid ? snapGrid : undefined)
const getType = $computed(() => { const getType = (node: GraphNode) => {
return (node: GraphNode) => {
const name = node.type || 'default' const name = node.type || 'default'
let nodeType = node.template ?? getNodeTypes[name] let nodeType = node.template ?? getNodeTypes[name]
const instance = getCurrentInstance() const instance = getCurrentInstance()
@@ -47,7 +46,6 @@ const getType = $computed(() => {
return slot return slot
} }
})
</script> </script>
<script lang="ts"> <script lang="ts">
export default { export default {
+1 -3
View File
@@ -67,8 +67,6 @@ onMounted(async () => {
fitViewOnInit && instance.fitView() fitViewOnInit && instance.fitView()
emits.paneReady(instance) emits.paneReady(instance)
}) })
const transform = computed(() => `translate(${viewport.x}px,${viewport.y}px) scale(${viewport.zoom})`)
</script> </script>
<script lang="ts"> <script lang="ts">
export default { export default {
@@ -79,7 +77,7 @@ export default {
<div <div
:key="`transform-${id}`" :key="`transform-${id}`"
class="vue-flow__transformationpane vue-flow__container" class="vue-flow__transformationpane vue-flow__container"
:style="{ transform, opacity: ready ? undefined : 0 }" :style="{ transform: `translate(${viewport.x}px,${viewport.y}px) scale(${viewport.zoom})`, opacity: ready ? undefined : 0 }"
> >
<NodeRenderer /> <NodeRenderer />
<EdgeRenderer /> <EdgeRenderer />
-2
View File
@@ -13,11 +13,9 @@ export default defineConfig({
alias: { alias: {
'~': resolve('src'), '~': resolve('src'),
}, },
dedupe: ['vue'],
extensions: ['.ts', '.vue'], extensions: ['.ts', '.vue'],
}, },
build: { build: {
minify: 'esbuild',
emptyOutDir: false, emptyOutDir: false,
lib: { lib: {
formats: ['es', 'cjs', 'iife'], formats: ['es', 'cjs', 'iife'],