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.

fix(electron): app menu about action (#10445)

pengx17629aea48df3c
diff --git a/packages/frontend/apps/electron-renderer/src/app.tsx b/packages/frontend/apps/electron-renderer/src/app.tsx
index 8424fbd7bb..234d75d221 100644
--- a/packages/frontend/apps/electron-renderer/src/app.tsx
+++ b/packages/frontend/apps/electron-renderer/src/app.tsx
@@ -142,12 +142,6 @@ window.addEventListener('unload', () => {
.catch(console.error);
});
-events?.applicationMenu.openAboutPageInSettingModal(() =>
- frameworkProvider.get(WorkspaceDialogService).open('setting', {
- activeTab: 'about',
- })
-);
-
function getCurrentWorkspace() {
const currentWorkspaceId = frameworkProvider
.get(GlobalContextService)
@@ -167,6 +161,18 @@ function getCurrentWorkspace() {
};
}
+events?.applicationMenu.openAboutPageInSettingModal(() => {
+ const currentWorkspace = getCurrentWorkspace();
+ if (!currentWorkspace) {
+ return;
+ }
+ const { workspace, dispose } = currentWorkspace;
+ workspace.scope.get(WorkspaceDialogService).open('setting', {
+ activeTab: 'about',
+ });
+ dispose();
+});
+
events?.applicationMenu.onNewPageAction(type => {
const currentWorkspace = getCurrentWorkspace();
if (!currentWorkspace) {
diff --git a/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts b/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts
index 11d14784ec..fc7e183f1a 100644
--- a/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts
+++ b/packages/frontend/core/src/components/hooks/use-register-workspace-commands.ts
@@ -60,8 +60,9 @@ export function useRegisterWorkspaceCommands() {
const appSidebarService = useService(AppSidebarService);
const i18n = useService(I18nService).i18n;
- const quitAndInstall =
- useServiceOptional(DesktopApiService)?.handler.updater.quitAndInstall;
+ const desktopApiService = useServiceOptional(DesktopApiService);
+
+ const quitAndInstall = desktopApiService?.handler.updater.quitAndInstall;
useEffect(() => {
const unsub = registerCMDKCommand(cmdkQuickSearchService);
@@ -124,7 +125,6 @@ export function useRegisterWorkspaceCommands() {
};
}, [editorSettingService, store, t, theme]);
- // register AffineLanguageCommands
useEffect(() => {
const unsub = registerAffineLanguageCommands({
i18n,