feat: Add dedicated default loading component

* add option to pass a transition name

Signed-off-by: Braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
Braks
2021-11-20 18:22:05 +01:00
parent 4e8ff6201a
commit 668fed1dc4
6 changed files with 137 additions and 65 deletions

View File

@@ -51,7 +51,7 @@ const updateElements = () => {
<template>
<VueFlow
v-model="elements"
:show-loading-indicator="true"
:loading="{ label: 'Loading...', transition: { name: 'fade', mode: 'out-in' } }"
@load="onLoad"
@elementsRemove="onElementsRemove"
@connect="onConnect"
@@ -66,3 +66,14 @@ const updateElements = () => {
</div>
</VueFlow>
</template>
<style>
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.35s ease;
}
.fade-enter-from,
.fade-leave-active {
opacity: 0;
}
</style>

View File

@@ -0,0 +1,18 @@
<script lang="ts" setup>
import { CSSProperties } from 'vue'
interface LoadingIndicatorProps {
label?: string
class?: string
style?: CSSProperties
}
const props = withDefaults(defineProps<LoadingIndicatorProps>(), {
label: 'Almost ready...',
})
</script>
<template>
<div class="vue-flow__loading-indicator" :class="props.class" :style="props.style">
<slot name="label"> {{ props.label }} </slot>
</div>
</template>

View File

@@ -16,11 +16,13 @@ import {
FlowStore,
FlowState,
FlowInstance,
Loading,
} from '../../types'
import ZoomPane from '../../container/ZoomPane/ZoomPane.vue'
import SelectionPane from '../../container/SelectionPane/SelectionPane.vue'
import NodeRenderer from '../../container/NodeRenderer/NodeRenderer.vue'
import EdgeRenderer from '../../container/EdgeRenderer/EdgeRenderer.vue'
import ZoomPane from '../ZoomPane/ZoomPane.vue'
import SelectionPane from '../SelectionPane/SelectionPane.vue'
import NodeRenderer from '../NodeRenderer/NodeRenderer.vue'
import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue'
import LoadingIndicator from '../../components/Loading/LoadingIndicator.vue'
import { createHooks, initFlow, useZoomPanHelper } from '../../composables'
import { onLoadGetElements, onLoadProject, onLoadToObject } from '../../utils'
@@ -62,7 +64,7 @@ export interface FlowProps extends Partial<FlowOptions> {
zoomOnDoubleClick?: boolean
edgeUpdaterRadius?: number
storageKey?: string
showLoadingIndicator?: boolean
loading?: Loading
}
const emit = defineEmits([...Object.keys(createHooks()), 'update:elements', 'update:modelValue'])
@@ -104,7 +106,7 @@ const props = withDefaults(defineProps<FlowProps>(), {
panOnScrollMode: PanOnScrollMode.Free,
paneMoveable: true,
edgeUpdaterRadius: 10,
showLoadingIndicator: false,
loading: false,
})
const store = initFlow(emit, typeof props.storageKey === 'string' ? props.storageKey : props.id, props.store)
const elements = useVModel(props, props.elements.length ? 'elements' : 'modelValue', emit)
@@ -169,57 +171,89 @@ invoke(async () => {
store.hooks.load.trigger(instance)
store.instance = instance
})
const transitionName = computed(() => {
let name = ''
if (typeof store.loading === 'object' && store.loading.transition) {
if (typeof store.loading.transition === 'string') name = store.loading.transition
else name = store.loading.transition.name
}
return name
})
const transitionMode = computed(() => {
let mode = ''
if (typeof store.loading === 'object' && store.loading.transition) {
if (typeof store.loading.transition !== 'string') mode = store.loading.transition.mode
}
return mode
})
</script>
<template>
<div class="vue-flow">
<Suspense>
<ZoomPane
:selection-key-code="store.selectionKeyCode"
:zoom-activation-key-code="store.zoomActivationKeyCode"
:default-zoom="store.defaultZoom"
:default-position="store.defaultPosition"
:zoom-on-scroll="store.zoomOnScroll"
:zoom-on-pinch="store.zoomOnPinch"
:zoom-on-double-click="store.zoomOnDoubleClick"
:pan-on-scroll="store.panOnScroll"
:pan-on-scroll-speed="store.panOnScrollSpeed"
:pan-on-scroll-mode="store.panOnScrollMode"
:pane-moveable="store.paneMoveable"
>
<template v-if="store.dimensions.width > 0 && !isNaN(store.dimensions.width)" #default="zoomPaneProps">
<SelectionPane
:delete-key-code="store.deleteKeyCode"
:multi-selection-key-code="store.multiSelectionKeyCode"
:selection-key-code="store.selectionKeyCode"
>
<NodeRenderer :select-nodes-on-drag="store.selectNodesOnDrag">
<template v-for="nodeName of Object.keys(store.getNodeTypes)" #[`node-${nodeName}`]="nodeProps">
<slot :name="`node-${nodeName}`" v-bind="nodeProps"></slot>
</template>
</NodeRenderer>
<EdgeRenderer
:connection-line-type="store.connectionLineType"
:connection-line-style="store.connectionLineStyle"
:arrow-head-color="store.arrowHeadColor"
:marker-end-id="store.markerEndId"
<Transition key="vue-flow-transition" :name="transitionName">
<Suspense>
<ZoomPane
key="zoom-pane"
:selection-key-code="store.selectionKeyCode"
:zoom-activation-key-code="store.zoomActivationKeyCode"
:default-zoom="store.defaultZoom"
:default-position="store.defaultPosition"
:zoom-on-scroll="store.zoomOnScroll"
:zoom-on-pinch="store.zoomOnPinch"
:zoom-on-double-click="store.zoomOnDoubleClick"
:pan-on-scroll="store.panOnScroll"
:pan-on-scroll-speed="store.panOnScrollSpeed"
:pan-on-scroll-mode="store.panOnScrollMode"
:pane-moveable="store.paneMoveable"
>
<template #default="zoomPaneProps">
<SelectionPane
key="selection-pane"
:delete-key-code="store.deleteKeyCode"
:multi-selection-key-code="store.multiSelectionKeyCode"
:selection-key-code="store.selectionKeyCode"
>
<template v-for="edgeName of Object.keys(store.getEdgeTypes)" #[`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>
<NodeRenderer key="node-renderer" :select-nodes-on-drag="store.selectNodesOnDrag">
<template
v-for="nodeName of Object.keys(store.getNodeTypes)"
#[`node-${nodeName}`]="nodeProps"
:key="`node-${nodeName}`"
>
<slot :name="`node-${nodeName}`" v-bind="nodeProps"></slot>
</template>
</NodeRenderer>
<EdgeRenderer
key="edge-renderer"
:connection-line-type="store.connectionLineType"
:connection-line-style="store.connectionLineStyle"
:arrow-head-color="store.arrowHeadColor"
:marker-end-id="store.markerEndId"
>
<template
v-for="edgeName of Object.keys(store.getEdgeTypes)"
#[`edge-${edgeName}`]="edgeProps"
:key="`edge-${edgeName}`"
>
<slot :name="`edge-${edgeName}`" v-bind="edgeProps"></slot>
</template>
<template #custom-connection-line="customConnectionLineProps">
<slot key="connection-line" name="custom-connection-line" v-bind="customConnectionLineProps"></slot>
</template>
</EdgeRenderer>
</SelectionPane>
<slot name="zoom-pane" v-bind="zoomPaneProps"></slot>
</template>
</ZoomPane>
<template v-if="store.loading" #fallback>
<slot key="loading-indicator" name="loading-indicator">
<LoadingIndicator key="default-loading-indicator" v-bind="store.loading">
<slot name="loading-label" />
</LoadingIndicator>
</slot>
</template>
</ZoomPane>
<template v-if="store.showLoadingIndicator" #fallback>
<slot name="loading-indicator">
<div class="vue-flow__loading-indicator">Almost ready...</div>
</slot>
</template>
</Suspense>
</Suspense>
</Transition>
<slot v-bind="{ store }"></slot>
</div>
</template>

View File

@@ -88,7 +88,7 @@ export const initialState = (): FlowState => ({
isReady: false,
hooks: createHooks(),
showLoadingIndicator: false,
loading: false,
vueFlowVersion: typeof __VUE_FLOW_VERSION__ !== 'undefined' ? __VUE_FLOW_VERSION__ : '-',
})

View File

@@ -20,13 +20,9 @@ import { D3Selection, D3Zoom, D3ZoomHandler } from './panel'
import { FlowHooks } from './hooks'
export interface FlowState extends FlowOptions {
dimensions: Dimensions
transform: Transform
elements: Elements
nodes: Node[]
nodeTypes?: NodeTypes
edges: Edge[]
edgeTypes?: EdgeTypes
selectedElements?: Elements
selectedNodesBbox: Rect
@@ -37,11 +33,13 @@ export interface FlowState extends FlowOptions {
maxZoom: number
translateExtent: TranslateExtent
nodeExtent: NodeExtent
dimensions: Dimensions
transform: Transform
nodesSelectionActive: boolean
selectionActive: boolean
userSelectionRect: SelectionRect
multiSelectionActive: boolean
connectionNodeId?: ElementId
connectionHandleId?: ElementId
@@ -56,10 +54,6 @@ export interface FlowState extends FlowOptions {
nodesConnectable: boolean
elementsSelectable: boolean
multiSelectionActive: boolean
vueFlowVersion: string
onConnect?: OnConnectFunc
onConnectStart?: OnConnectStartFunc
onConnectStop?: OnConnectStopFunc
@@ -67,8 +61,9 @@ export interface FlowState extends FlowOptions {
isReady: boolean
hooks: FlowHooks
storageKey?: string
instance?: FlowInstance
vueFlowVersion: string
}
export interface FlowGetters {

View File

@@ -78,6 +78,20 @@ export type FitViewFunc = (fitViewOptions?: FitViewParams) => void
export type ProjectFunc = (position: XYPosition) => XYPosition
export type ToObjectFunc<T = any> = () => FlowExportObject<T>
export type Loading =
| {
label: string
transition?:
| string
| {
name: string
mode: string
}
style: CSSProperties
class: string
}
| boolean
export type FlowInstance<T = any> = {
zoomIn: () => void
zoomOut: () => void
@@ -126,5 +140,5 @@ export interface FlowOptions {
zoomOnDoubleClick?: boolean
edgeUpdaterRadius?: number
storageKey?: string
showLoadingIndicator?: boolean
loading?: Loading
}