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

fix(core): check if injected state matches options and scope id (#1562)

Browse Source 
* fix(core): prefer options id when finding state

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>

* fix(core): check if injected state matches options id

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>

* chore(changeset): add

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>

---------

Signed-off-by: braks <78412429+bcakmakoglu@users.noreply.github.com>
This commit is contained in:
Braks
2024-07-27 20:21:33 +02:00
parent 6d9535a1a9
commit fff558fbc3
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/beige-shoes-fold.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@vue-flow/core": patch
---
Check if injected vue flow state matches options id, otherwise create new state

5
.changeset/funny-jokes-lie.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@vue-flow/core": patch
---
Prefer options id over scope id when finding vue flow internal state by id

10
packages/core/src/composables/useVueFlow.ts
View File

@@ -33,7 +33,7 @@ export function useVueFlow(idOrOpts?: any): VueFlowStore {
const options = isOptsObj ? idOrOpts : { id: idOrOpts }
const id = options.id
const vueFlowId = scope?.vueFlowId || id
const vueFlowId = id ?? scope?.vueFlowId
let vueFlow: Injection
@@ -42,9 +42,9 @@ export function useVueFlow(idOrOpts?: any): VueFlowStore {
* this should be the regular way after initialization
*/
if (scope) {
const injection = inject(VueFlow, null)
if (typeof injection !== 'undefined' && injection !== null) {
vueFlow = injection
const injectedState = inject(VueFlow, null)
if (typeof injectedState !== 'undefined' && injectedState !== null && (!vueFlowId || injectedState.id === vueFlowId)) {
vueFlow = injectedState
}
}
@@ -63,7 +63,7 @@ export function useVueFlow(idOrOpts?: any): VueFlowStore {
* _or_ if the store instance we found does not match up with provided ids
* create a new store instance and register it in storage
*/
if (!vueFlow || (vueFlow && id && id !== vueFlow.id)) {
if (!vueFlow || (vueFlowId && vueFlow.id !== vueFlowId)) {
const name = id ?? storage.getId()
const state = storage.create(name, options)