fix(viewpane,nodes): move resize observer to mounted hooks

This commit is contained in:
braks
2022-10-07 22:55:38 +02:00
committed by Braks
parent fe918c0bd8
commit de6220b3b3
2 changed files with 40 additions and 34 deletions
@@ -23,7 +23,10 @@ const draggable = (d?: boolean) => (typeof d === 'undefined' ? nodesDraggable :
const selectable = (s?: boolean) => (typeof s === 'undefined' ? elementsSelectable : s) const selectable = (s?: boolean) => (typeof s === 'undefined' ? elementsSelectable : s)
const connectable = (c?: boolean) => (typeof c === 'undefined' ? nodesConnectable : c) const connectable = (c?: boolean) => (typeof c === 'undefined' ? nodesConnectable : c)
const resizeObserver = new ResizeObserver((entries) => { const resizeObserver = ref<ResizeObserver>()
onMounted(() => {
resizeObserver.value = new ResizeObserver((entries) => {
const updates = entries.map((entry: ResizeObserverEntry) => ({ const updates = entries.map((entry: ResizeObserverEntry) => ({
id: entry.target.getAttribute('data-id') as string, id: entry.target.getAttribute('data-id') as string,
nodeElement: entry.target as HTMLDivElement, nodeElement: entry.target as HTMLDivElement,
@@ -32,11 +35,10 @@ const resizeObserver = new ResizeObserver((entries) => {
updateNodeDimensions(updates) updateNodeDimensions(updates)
}) })
onBeforeUnmount(() => {
resizeObserver.disconnect()
}) })
onBeforeUnmount(() => resizeObserver.value?.disconnect())
const getType = (type?: string, template?: GraphNode['template']) => { const getType = (type?: string, template?: GraphNode['template']) => {
const name = type || 'default' const name = type || 'default'
let nodeType = template ?? getNodeTypes[name] let nodeType = template ?? getNodeTypes[name]
@@ -70,6 +72,7 @@ export default {
<template> <template>
<div class="vue-flow__nodes vue-flow__container"> <div class="vue-flow__nodes vue-flow__container">
<template v-if="resizeObserver">
<NodeWrapper <NodeWrapper
v-for="node of getNodes" v-for="node of getNodes"
:id="node.id" :id="node.id"
@@ -82,5 +85,6 @@ export default {
:connectable="connectable(node.connectable)" :connectable="connectable(node.connectable)"
:node="node" :node="node"
/> />
</template>
</div> </div>
</template> </template>
@@ -57,10 +57,11 @@ let transform = $ref({
zoom: clampedZoom, zoom: clampedZoom,
}) })
useResizeObserver(viewportEl, (ev) => { onMounted(() => {
if (!ev[0].target) return useResizeObserver(viewportEl, () => {
if (!viewportEl.value) return
const { width, height } = getDimensions(ev[0].target as HTMLDivElement) const { width, height } = getDimensions(viewportEl.value)
dimensions.width = width dimensions.width = width
dimensions.height = height dimensions.height = height
}) })
@@ -73,6 +74,7 @@ useEventListener(window, 'resize', () => {
dimensions.width = width dimensions.width = width
dimensions.height = height dimensions.height = height
}) })
})
onMounted(() => { onMounted(() => {
const d3Zoom = zoom<HTMLDivElement, any>().scaleExtent([minZoom, maxZoom]).translateExtent(translateExtent) const d3Zoom = zoom<HTMLDivElement, any>().scaleExtent([minZoom, maxZoom]).translateExtent(translateExtent)