Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

feat(electron): close inactive views when switching workspace (#9601)

pengx177d2ee8d742d0
diff --git a/packages/frontend/core/src/components/workspace-selector/index.tsx b/packages/frontend/core/src/components/workspace-selector/index.tsx
index 1f77cc8795..099fd3124c 100644
--- a/packages/frontend/core/src/components/workspace-selector/index.tsx
+++ b/packages/frontend/core/src/components/workspace-selector/index.tsx
@@ -1,12 +1,17 @@
import { Menu, type MenuProps } from '@affine/component';
import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
import { GlobalContextService } from '@affine/core/modules/global-context';
+import { WorkbenchService } from '@affine/core/modules/workbench';
import {
type WorkspaceMetadata,
WorkspacesService,
} from '@affine/core/modules/workspace';
import { track } from '@affine/track';
-import { useLiveData, useServices } from '@toeverything/infra';
+import {
+ useLiveData,
+ useServiceOptional,
+ useServices,
+} from '@toeverything/infra';
import { useCallback, useEffect, useState } from 'react';
import { UserWithWorkspaceList } from './user-with-workspace-list';
@@ -124,22 +129,33 @@ export const WorkspaceNavigator = ({
...props
}: WorkspaceSelectorProps) => {
const { jumpToPage } = useNavigateHelper();
+ const workbench = useServiceOptional(WorkbenchService)?.workbench;
const handleClickWorkspace = useCallback(
(workspaceMetadata: WorkspaceMetadata) => {
onSelectWorkspace?.(workspaceMetadata);
+
+ const closeInactiveViews = () =>
+ workbench?.views$.value.forEach(view => {
+ if (workbench?.activeView$.value !== view) {
+ workbench?.close(view);
+ }
+ });
+
if (document.startViewTransition) {
document.startViewTransition(() => {
+ closeInactiveViews();
jumpToPage(workspaceMetadata.id, 'all');
return new Promise(resolve =>
setTimeout(resolve, 150)
); /* start transition after 150ms */
});
} else {
+ closeInactiveViews();
jumpToPage(workspaceMetadata.id, 'all');
}
},
- [onSelectWorkspace, jumpToPage]
+ [jumpToPage, onSelectWorkspace, workbench]
);
const handleCreatedWorkspace = useCallback(
(payload: { metadata: WorkspaceMetadata; defaultDocId?: string }) => {