feat: Add suspensions to node, noderenderer and around zoom-pane

* bind zoompanhelper functions to zoom-pane slot

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
Braks
2021-11-18 14:08:46 +01:00
parent 54dfd8498b
commit 14980e38b7
4 changed files with 118 additions and 98 deletions
+44 -42
View File
@@ -144,47 +144,33 @@ onMounted(() => {
@move="onDrag" @move="onDrag"
@stop="onDragStop" @stop="onDragStop"
> >
<div <Suspense>
ref="node-element" <div
:class="[ ref="node-element"
'vue-flow__node', :class="[
`vue-flow__node-${props.node.type}`, 'vue-flow__node',
{ `vue-flow__node-${props.node.type}`,
selected: props.selected, {
selectable: selectable, selected: props.selected,
}, selectable: selectable,
props.node.class, },
]" props.node.class,
:style="{ ]"
zIndex: props.selected ? 10 : 3, :style="{
transform: `translate(${props.node.__rf?.position?.x}px,${props.node.__rf?.position?.y}px)`, zIndex: props.selected ? 10 : 3,
pointerEvents: selectable || draggable ? 'all' : 'none', transform: `translate(${props.node.__rf?.position?.x}px,${props.node.__rf?.position?.y}px)`,
opacity: props.node.__rf?.width !== null && props.node.__rf?.height !== null ? 1 : 0, pointerEvents: selectable || draggable ? 'all' : 'none',
...props.node.style, opacity: props.node.__rf?.width !== null && props.node.__rf?.height !== null ? 1 : 0,
}" ...props.node.style,
:data-id="props.node.id"
@mouseenter="onMouseEnterHandler"
@mousemove="onMouseMoveHandler"
@mouseleave="onMouseLeaveHandler"
@contextmenu="onContextMenuHandler"
@click="onSelectNodeHandler"
>
<slot
v-bind="{
id: props.node.id,
data: props.node.data,
type: props.node.type,
xPos: props.node.__rf?.position?.x,
yPos: props.node.__rf?.position?.y,
selected: props.selected,
connectable,
sourcePosition: props.node.sourcePosition,
targetPosition: props.node.targetPosition,
dragging: props.node.__rf?.isDragging,
}" }"
:data-id="props.node.id"
@mouseenter="onMouseEnterHandler"
@mousemove="onMouseMoveHandler"
@mouseleave="onMouseLeaveHandler"
@contextmenu="onContextMenuHandler"
@click="onSelectNodeHandler"
> >
<component <slot
:is="props.type"
v-bind="{ v-bind="{
id: props.node.id, id: props.node.id,
data: props.node.data, data: props.node.data,
@@ -197,8 +183,24 @@ onMounted(() => {
targetPosition: props.node.targetPosition, targetPosition: props.node.targetPosition,
dragging: props.node.__rf?.isDragging, dragging: props.node.__rf?.isDragging,
}" }"
/> >
</slot> <component
</div> :is="props.type"
v-bind="{
id: props.node.id,
data: props.node.data,
type: props.node.type,
xPos: props.node.__rf?.position?.x,
yPos: props.node.__rf?.position?.y,
selected: props.selected,
connectable,
sourcePosition: props.node.sourcePosition,
targetPosition: props.node.targetPosition,
dragging: props.node.__rf?.isDragging,
}"
/>
</slot>
</div>
</Suspense>
</DraggableCore> </DraggableCore>
</template> </template>
+15 -13
View File
@@ -48,18 +48,20 @@ const selected = (nodeId: string) => store.selectedElements?.some(({ id }) => id
</script> </script>
<template> <template>
<div class="vue-flow__nodes" :style="{ transform }"> <div class="vue-flow__nodes" :style="{ transform }">
<template v-for="node of nodes" :key="node.id"> <Suspense>
<Node <template v-for="node of nodes" :key="node.id">
:node="node" <Node
:type="type(node)" :node="node"
:snap-grid="snapGrid" :type="type(node)"
:select-nodes-on-drag="props.selectNodesOnDrag" :snap-grid="snapGrid"
:selected="selected(node.id)" :select-nodes-on-drag="props.selectNodesOnDrag"
> :selected="selected(node.id)"
<template #default="nodeProps"> >
<slot :name="`node-${node.type}`" v-bind="nodeProps"></slot> <template #default="nodeProps">
</template> <slot :name="`node-${node.type}`" v-bind="nodeProps"></slot>
</Node> </template>
</template> </Node>
</template>
</Suspense>
</div> </div>
</template> </template>
+48 -42
View File
@@ -1,5 +1,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { CSSProperties, onBeforeUnmount } from 'vue' import { CSSProperties, onBeforeUnmount } from 'vue'
import { invoke } from '@vueuse/core'
import { import {
ConnectionLineType, ConnectionLineType,
ConnectionMode, ConnectionMode,
@@ -131,7 +132,10 @@ watch(
(val) => init(val), (val) => init(val),
{ flush: 'pre', deep: true }, { flush: 'pre', deep: true },
) )
init(props) invoke(async () => {
await until(props.elements).toMatch((y) => y.length > 0)
init(props)
})
const nodeTypes = computed(() => { const nodeTypes = computed(() => {
let types = defaultNodeTypes let types = defaultNodeTypes
@@ -148,48 +152,50 @@ const edgeTypes = computed(() => {
</script> </script>
<template> <template>
<div class="vue-flow"> <div class="vue-flow">
<ZoomPane <Suspense>
:selection-key-code="props.selectionKeyCode" <ZoomPane
:zoom-activation-key-code="props.zoomActivationKeyCode" :selection-key-code="props.selectionKeyCode"
:default-zoom="props.defaultZoom" :zoom-activation-key-code="props.zoomActivationKeyCode"
:default-position="props.defaultPosition" :default-zoom="props.defaultZoom"
:zoom-on-scroll="props.zoomOnScroll" :default-position="props.defaultPosition"
:zoom-on-pinch="props.zoomOnPinch" :zoom-on-scroll="props.zoomOnScroll"
:zoom-on-double-click="props.zoomOnDoubleClick" :zoom-on-pinch="props.zoomOnPinch"
:pan-on-scroll="props.panOnScroll" :zoom-on-double-click="props.zoomOnDoubleClick"
:pan-on-scroll-speed="props.panOnScrollSpeed" :pan-on-scroll="props.panOnScroll"
:pan-on-scroll-mode="props.panOnScrollMode" :pan-on-scroll-speed="props.panOnScrollSpeed"
:pane-moveable="props.paneMoveable" :pan-on-scroll-mode="props.panOnScrollMode"
> :pane-moveable="props.paneMoveable"
<template #default="zoomPaneProps"> >
<SelectionPane <template #default="zoomPaneProps">
:delete-key-code="props.deleteKeyCode" <SelectionPane
:multi-selection-key-code="props.multiSelectionKeyCode" :delete-key-code="props.deleteKeyCode"
:selection-key-code="props.selectionKeyCode" :multi-selection-key-code="props.multiSelectionKeyCode"
> :selection-key-code="props.selectionKeyCode"
<NodeRenderer :node-types="nodeTypes" :select-nodes-on-drag="props.selectNodesOnDrag">
<template v-for="nodeName of Object.keys(nodeTypes)" #[`node-${nodeName}`]="nodeProps">
<slot :name="`node-${nodeName}`" v-bind="nodeProps"></slot>
</template>
</NodeRenderer>
<EdgeRenderer
:connection-line-type="props.connectionLineType"
:connection-line-style="props.connectionLineStyle"
:arrow-head-color="props.arrowHeadColor"
:marker-end-id="props.markerEndId"
:edge-types="edgeTypes"
> >
<template v-for="edgeName of Object.keys(edgeTypes)" #[`edge-${edgeName}`]="edgeProps"> <NodeRenderer :node-types="nodeTypes" :select-nodes-on-drag="props.selectNodesOnDrag">
<slot :name="`edge-${edgeName}`" v-bind="edgeProps"></slot> <template v-for="nodeName of Object.keys(nodeTypes)" #[`node-${nodeName}`]="nodeProps">
</template> <slot :name="`node-${nodeName}`" v-bind="nodeProps"></slot>
<template #custom-connection-line="customConnectionLineProps"> </template>
<slot name="custom-connection-line" v-bind="customConnectionLineProps"></slot> </NodeRenderer>
</template> <EdgeRenderer
</EdgeRenderer> :connection-line-type="props.connectionLineType"
</SelectionPane> :connection-line-style="props.connectionLineStyle"
<slot name="zoom-pane" v-bind="zoomPaneProps"></slot> :arrow-head-color="props.arrowHeadColor"
</template> :marker-end-id="props.markerEndId"
</ZoomPane> :edge-types="edgeTypes"
>
<template v-for="edgeName of Object.keys(edgeTypes)" #[`edge-${edgeName}`]="edgeProps">
<slot :name="`edge-${edgeName}`" v-bind="edgeProps"></slot>
</template>
<template #custom-connection-line="customConnectionLineProps">
<slot name="custom-connection-line" v-bind="customConnectionLineProps"></slot>
</template>
</EdgeRenderer>
</SelectionPane>
<slot name="zoom-pane" v-bind="zoomPaneProps"></slot>
</template>
</ZoomPane>
</Suspense>
<slot v-bind="{ ...props, store, hooks }"></slot> <slot v-bind="{ ...props, store, hooks }"></slot>
</div> </div>
</template> </template>
+11 -1
View File
@@ -212,7 +212,17 @@ watchOnce(
<template> <template>
<Suspense> <Suspense>
<div ref="zoomPane" class="vue-flow__renderer vue-flow__zoompane"> <div ref="zoomPane" class="vue-flow__renderer vue-flow__zoompane">
<slot v-bind="{ transform, dimensions: { width, height } }"></slot> <slot
v-bind="{
transform,
dimensions: { width, height },
zoomIn,
zoomOut,
zoomTo,
setTransform,
fitView,
}"
></slot>
</div> </div>
</Suspense> </Suspense>
</template> </template>