From 9ba47f43bbb91beb95eb10faa5d16bab9a7844ab Mon Sep 17 00:00:00 2001
From: EYHN <cneyhn@gmail.com>
Date: Fri, 15 Mar 2024 03:45:40 +0000
Subject: [PATCH] fix(core): fix active view undefined (#6131)

close https://github.com/toeverything/AFFiNE/issues/6127, #6132
---
 .../core/src/modules/workbench/entities/workbench.ts         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/core/src/modules/workbench/entities/workbench.ts b/packages/frontend/core/src/modules/workbench/entities/workbench.ts
index 203049aca7..79dc48e392 100644
--- a/packages/frontend/core/src/modules/workbench/entities/workbench.ts
+++ b/packages/frontend/core/src/modules/workbench/entities/workbench.ts
@@ -98,8 +98,9 @@ export class Workbench {
     if (index === -1) return;
     const newViews = [...this.views.value];
     newViews.splice(index, 1);
-    if (index !== 0) {
-      this.active(index - 1);
+    const activeViewIndex = this.activeViewIndex.value;
+    if (activeViewIndex !== 0 && activeViewIndex >= index) {
+      this.active(activeViewIndex - 1);
     }
     this.views.next(newViews);
   }