alighasami/vue-flow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): element watcher not emitting changes with addNodes / addEdges

Browse Source 
Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
braks
2022-12-14 15:53:38 +01:00
committed by Braks
parent eef24a368a
commit dab20a6e5c
1 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/utils/watch.ts
+58 -52
View File
@@ -16,7 +16,7 @@ export const useWatch = (
let pauseModel: WatchPausableReturn
let pauseStore: WatchPausableReturn
const immediate = !!(models.modelValue && models.modelValue.value && models.modelValue.value.length)
const immediate = !!(models.modelValue && models.modelValue.value)
// eslint-disable-next-line prefer-const
pauseModel = watchPausable(
@@ -25,23 +25,7 @@ export const useWatch = (
if (elements && Array.isArray(elements)) {
pauseStore?.pause()
store.setElements(elements)
pauseStore = watchPausable(
[store.nodes, store.edges, () => store.edges.value.length, () => store.nodes.value.length],
([nodes, edges]) => {
if (models.modelValue?.value && Array.isArray(models.modelValue.value)) {
pauseModel?.pause()
models.modelValue.value = [...nodes, ...edges]
nextTick(() => {
pauseModel?.resume()
})
}
},
{ immediate: true },
)
if (models.modelValue?.value?.length) store.setElements(elements)
nextTick(() => {
pauseStore?.resume()
@@ -51,6 +35,24 @@ export const useWatch = (
{ immediate },
)
nextTick(() => {
pauseStore = watchPausable(
[store.nodes, store.edges, () => store.edges.value.length, () => store.nodes.value.length],
([nodes, edges]) => {
if (models.modelValue?.value && Array.isArray(models.modelValue.value)) {
pauseModel?.pause()
models.modelValue.value = [...nodes, ...edges]
nextTick(() => {
pauseModel?.resume()
})
}
},
{ immediate },
)
})
onScopeDispose(() => {
pauseModel?.stop()
pauseStore?.stop()
@@ -63,7 +65,7 @@ export const useWatch = (
let pauseModel: WatchPausableReturn
let pauseStore: WatchPausableReturn
const immediate = !!(models.nodes && models.nodes.value && models.nodes.value.length)
const immediate = !!(models.nodes && models.nodes.value)
// eslint-disable-next-line prefer-const
pauseModel = watchPausable(
@@ -74,22 +76,6 @@ export const useWatch = (
store.setNodes(nodes)
pauseStore = watchPausable(
[store.nodes, () => store.nodes.value.length],
([nodes]) => {
if (models.nodes?.value && Array.isArray(models.nodes.value)) {
pauseModel?.pause()
models.nodes.value = [...nodes]
nextTick(() => {
pauseModel?.resume()
})
}
},
{ immediate: true },
)
nextTick(() => {
pauseStore?.resume()
})
@@ -98,6 +84,24 @@ export const useWatch = (
{ immediate },
)
nextTick(() => {
pauseStore = watchPausable(
[store.nodes, () => store.nodes.value.length],
([nodes]) => {
if (models.nodes?.value && Array.isArray(models.nodes.value)) {
pauseModel?.pause()
models.nodes.value = [...nodes]
nextTick(() => {
pauseModel?.resume()
})
}
},
{ immediate },
)
})
onScopeDispose(() => {
pauseModel?.stop()
pauseStore?.stop()
@@ -110,7 +114,7 @@ export const useWatch = (
let pauseModel: WatchPausableReturn
let pauseStore: WatchPausableReturn
const immediate = !!(models.edges && models.edges.value && models.edges.value.length)
const immediate = !!(models.edges && models.edges.value)
// eslint-disable-next-line prefer-const
pauseModel = watchPausable(
@@ -121,22 +125,6 @@ export const useWatch = (
store.setEdges(edges)
pauseStore = watchPausable(
[store.edges, () => store.edges.value.length],
([edges]) => {
if (models.edges?.value && Array.isArray(models.edges.value)) {
pauseModel?.pause()
models.edges.value = [...edges]
nextTick(() => {
pauseModel?.resume()
})
}
},
{ immediate: true },
)
nextTick(() => {
pauseStore?.resume()
})
@@ -145,6 +133,24 @@ export const useWatch = (
{ immediate },
)
nextTick(() => {
pauseStore = watchPausable(
[store.edges, () => store.edges.value.length],
([edges]) => {
if (models.edges?.value && Array.isArray(models.edges.value)) {
pauseModel?.pause()
models.edges.value = [...edges]
nextTick(() => {
pauseModel?.resume()
})
}
},
{ immediate },
)
})
onScopeDispose(() => {
pauseModel?.stop()
pauseStore?.stop()