refactor(flow): deferr initial loading to Renderer.vue component

* suspend flow while async processing is going on (fallback to loading component)

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
Braks
2021-11-25 19:29:13 +01:00
parent 4408ca1eb7
commit 5b00049a65
2 changed files with 144 additions and 117 deletions
+49
View File
@@ -0,0 +1,49 @@
<script lang="ts" setup>
import { useStore, useWindow, useZoomPanHelper } from '~/composables'
import { Elements, FlowInstance } from '~/types'
import { onLoadGetElements, onLoadProject, onLoadToObject } from '~/utils'
interface RendererProps {
elements: Elements
}
const props = defineProps<RendererProps>()
const store = useStore()
// if there are preloaded elements we overwrite the current elements with the stored ones and reset the stored elements (so we can properly parse them)
const hasInitialElements = store.elements.length
const initialElements = hasInitialElements ? store.elements : props.elements
if (hasInitialElements) store.elements = []
await store.setElements(initialElements)
store.isReady = true
nextTick(async () => {
// if ssr we can't wait for dimensions, they'll never really exist
const window = useWindow()
if ('screen' in window)
await until(store.dimensions).toMatch(({ height, width }) => !isNaN(width) && width > 0 && !isNaN(height) && height > 0)
const { zoomIn, zoomOut, zoomTo, transform: setTransform, fitView } = useZoomPanHelper(store)
const instance: FlowInstance = {
fitView: (params = { padding: 0.1 }) => fitView(params),
zoomIn,
zoomOut,
zoomTo,
setTransform,
project: onLoadProject(store),
getElements: onLoadGetElements(store),
toObject: onLoadToObject(store),
}
store.hooks.load.trigger(instance)
store.instance = instance
})
</script>
<script lang="ts">
export default {
name: 'Renderer',
}
</script>
<template>
<slot />
</template>
+12 -34
View File
@@ -1,6 +1,5 @@
<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,
@@ -11,7 +10,6 @@ import {
NodeExtent, NodeExtent,
NodeTypes, NodeTypes,
EdgeTypes, EdgeTypes,
FlowInstance,
Loading, Loading,
FlowOptions, FlowOptions,
} from '../../types' } from '../../types'
@@ -20,8 +18,8 @@ import SelectionPane from '../SelectionPane/SelectionPane.vue'
import NodeRenderer from '../NodeRenderer/NodeRenderer.vue' import NodeRenderer from '../NodeRenderer/NodeRenderer.vue'
import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue' import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue'
import LoadingIndicator from '../../components/Loading/LoadingIndicator.vue' import LoadingIndicator from '../../components/Loading/LoadingIndicator.vue'
import { createHooks, initFlow, useWindow, useZoomPanHelper } from '../../composables' import { createHooks, initFlow } from '../../composables'
import { onLoadGetElements, onLoadProject, onLoadToObject } from '../../utils' import Renderer from '~/container/Renderer/Renderer.vue'
interface FlowProps extends FlowOptions { interface FlowProps extends FlowOptions {
id?: string id?: string
@@ -107,49 +105,27 @@ const props = withDefaults(defineProps<FlowProps>(), {
const store = initFlow(emit, typeof props.storageKey === 'string' ? props.storageKey : props.id) const store = initFlow(emit, typeof props.storageKey === 'string' ? props.storageKey : props.id)
const elements = useVModel(props, 'modelValue', emit) const elements = useVModel(props, 'modelValue', emit)
const options = Object.assign({}, store.$state, props) const options = Object.assign({}, store.$state, props)
invoke(async () => {
store.setState(options) store.setState(options)
// if there are preloaded elements we overwrite the current elements with the stored ones
await store.setElements(store.elements.length ? store.elements : elements.value)
store.isReady = true
// if ssr we can't wait for dimensions, they'll never really exist
const window = useWindow()
if ('screen' in window)
await until(store.dimensions).toMatch(({ height, width }) => !isNaN(width) && width > 0 && !isNaN(height) && height > 0)
const { zoomIn, zoomOut, zoomTo, transform: setTransform, fitView } = useZoomPanHelper(store)
const instance: FlowInstance = {
fitView: (params = { padding: 0.1 }) => fitView(params),
zoomIn,
zoomOut,
zoomTo,
setTransform,
project: onLoadProject(store),
getElements: onLoadGetElements(store),
toObject: onLoadToObject(store),
}
store.hooks.load.trigger(instance)
store.instance = instance
})
watch( watch(
() => props, () => props,
() => store.setState(props), () => store.setState(props),
{ flush: 'post', deep: true }, { flush: 'post', deep: true },
) )
watch( const { pause: pauseModel, resume: resumeModel } = pausableWatch(
() => props.modelValue.length, () => props.modelValue.length,
() => store.setElements(elements.value), async () => await store.setElements(elements.value),
) )
const { pause, resume } = pausableWatch(elements, store.setElements, { flush: 'post' }) const { pause, resume } = pausableWatch(elements, async (val) => await store.setElements(val), { flush: 'post' })
watch( watch(
() => store.elements, () => store.elements,
(val) => { (val) => {
pause() pause()
pauseModel()
elements.value = val elements.value = val
nextTick(resume) setTimeout(() => {
resume()
resumeModel()
}, 1)
}, },
{ flush: 'post', deep: true }, { flush: 'post', deep: true },
) )
@@ -175,6 +151,7 @@ export default {
<Transition :key="`vue-flow-transition-${store.$id}`" :name="transitionName"> <Transition :key="`vue-flow-transition-${store.$id}`" :name="transitionName">
<Suspense> <Suspense>
<template #default> <template #default>
<Renderer :elements="elements">
<ZoomPane <ZoomPane
:key="`zoom-pane-${store.$id}`" :key="`zoom-pane-${store.$id}`"
:prevent-scrolling="store.preventScrolling" :prevent-scrolling="store.preventScrolling"
@@ -262,6 +239,7 @@ export default {
<slot name="zoom-pane" v-bind="zoomPaneProps"></slot> <slot name="zoom-pane" v-bind="zoomPaneProps"></slot>
</template> </template>
</ZoomPane> </ZoomPane>
</Renderer>
</template> </template>
<template v-if="store.loading" #fallback> <template v-if="store.loading" #fallback>
<slot :key="`loading-indicator-${store.$id}`" name="loading-indicator"> <slot :key="`loading-indicator-${store.$id}`" name="loading-indicator">