Skip to content

AI-native design editor. Open-source Figma alternative.

fix(vue): discard stale workspace results

Danila Poyarkova6842fde47c0
diff --git a/packages/vue/src/document/workspace/previews.ts b/packages/vue/src/document/workspace/previews.ts
index 67b45c171..e4a613abf 100644
--- a/packages/vue/src/document/workspace/previews.ts
+++ b/packages/vue/src/document/workspace/previews.ts
@@ -24,7 +24,10 @@ export function createDocumentPreviews<Item extends DocumentWorkspaceItem>(
const previewQueue: string[] = []
const queued = new Set<string>()
const active = new Set<string>()
- const concurrency = Math.max(1, Math.floor(options.previewConcurrency ?? 6))
+ const requestedConcurrency = options.previewConcurrency ?? 6
+ const concurrency = Number.isFinite(requestedConcurrency)
+ ? Math.max(1, Math.floor(requestedConcurrency))
+ : 6
let disposed = false
function removeURL(id: string): void {
@@ -67,7 +70,11 @@ export function createDocumentPreviews<Item extends DocumentWorkspaceItem>(
} catch (error: unknown) {
if (!disposed && generation === (previewGenerations.get(id) ?? 0)) {
previewErrors.value = { ...previewErrors.value, [id]: error }
- options.onPreviewError?.(id, error)
+ try {
+ options.onPreviewError?.(id, error)
+ } catch (callbackError) {
+ console.error('[Vue] Preview error callback failed:', callbackError)
+ }
}
} finally {
active.delete(id)
@@ -104,10 +111,16 @@ export function createDocumentPreviews<Item extends DocumentWorkspaceItem>(
function reconcile(previousItems: readonly Item[], items: readonly Item[]): void {
const previous = new Map(previousItems.map((item) => [item.id, item.updatedAt]))
const current = new Map(items.map((item) => [item.id, item.updatedAt]))
- const trackedIds = new Set([...Object.keys(previewUrls.value), ...active, ...queued])
+ const trackedIds = new Set([
+ ...Object.keys(previewUrls.value),
+ ...active,
+ ...queued,
+ ...Object.keys(previewErrors.value)
+ ])
for (const id of trackedIds) {
if (previous.get(id) === current.get(id)) continue
removeURL(id)
+ clearError(id)
if (!current.has(id)) {
queued.delete(id)
continue
diff --git a/packages/vue/src/document/workspace/use.ts b/packages/vue/src/document/workspace/use.ts
index 26df816cc..b364f1905 100644
--- a/packages/vue/src/document/workspace/use.ts
+++ b/packages/vue/src/document/workspace/use.ts
@@ -12,7 +12,7 @@ export type DocumentWorkspaceItem = {
}
export interface DocumentWorkspaceSource<Item extends DocumentWorkspaceItem> {
- refresh(): Promise<Item[]>
+ refresh(): Promise<Item[] | null>
loadPreview(id: string): Promise<Uint8Array | null>
subscribe?(listener: () => void): () => void
}
@@ -54,7 +54,7 @@ export function useDocumentWorkspace<Item extends DocumentWorkspaceItem>(
const nextRefresh = options.source
.refresh()
.then((items) => {
- if (!disposed) {
+ if (!disposed && items) {
previews.reconcile(documents.value, items)
documents.value = items
lastRefreshedAt.value = new Date()
diff --git a/src/app/storage/workspace/source.ts b/src/app/storage/workspace/source.ts
index a89e390bf..ab43cc272 100644
--- a/src/app/storage/workspace/source.ts
+++ b/src/app/storage/workspace/source.ts
@@ -25,7 +25,7 @@ export function createStorageWorkspaceSource(
})
},
- async refresh(): Promise<StorageDocument[]> {
+ async refresh(): Promise<StorageDocument[] | null> {
const providerID = activeStorageProviderID.value
const provider = storageProviderRegistry.get(providerID)
const statuses = await storageCredentialStatuses(providerID)
@@ -47,7 +47,7 @@ export function createStorageWorkspaceSource(
updatedAt: metadata.updatedAt,
metadataAuthoritative: true
}))
- if (activeStorageProviderID.value !== providerID) return []
+ if (activeStorageProviderID.value !== providerID) return null
onSnapshot({ documents, configured })
return documents
}
@@ -66,7 +66,7 @@ export function createStorageWorkspaceSource(
lastSyncError: null
})
}
- if (activeStorageProviderID.value !== providerID) return []
+ if (activeStorageProviderID.value !== providerID) return null
onSnapshot({ documents: reconciliation.documents, configured })
return reconciliation.documents
},