Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-25 18:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): do not redirect to open-page for open-in-app card (#8646)

Browse Source
This commit is contained in:
pengx17
2024-10-31 08:23:51 +00:00
parent 2b3b7057c5
commit 51ffccbbb6
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/frontend/core/src/modules/app-sidebar/views/open-in-app-card/open-in-app-card.tsx
View File

@@ -1,5 +1,4 @@
import { Button, Checkbox } from '@affine/component'; import { Button, Checkbox } from '@affine/component';
import { useNavigateHelper } from '@affine/core/components/hooks/use-navigate-helper';
import { import {
OpenInAppService, OpenInAppService,
OpenLinkMode, OpenLinkMode,
@@ -16,17 +15,16 @@ import * as styles from './open-in-app-card.css';
export const OpenInAppCard = ({ className }: { className?: string }) => { export const OpenInAppCard = ({ className }: { className?: string }) => {
const openInAppService = useService(OpenInAppService); const openInAppService = useService(OpenInAppService);
const show = useLiveData(openInAppService.showOpenInAppBanner$); const show = useLiveData(openInAppService.showOpenInAppBanner$);
const navigateHelper = useNavigateHelper();
const t = useI18n(); const t = useI18n();
const [remember, setRemember] = useState(false); const [remember, setRemember] = useState(false);
const onOpen = useCallback(() => { const onOpen = useCallback(() => {
navigateHelper.jumpToOpenInApp(window.location.href, true); openInAppService.showOpenInAppPage();
if (remember) { if (remember) {
openInAppService.setOpenLinkMode(OpenLinkMode.OPEN_IN_DESKTOP_APP); openInAppService.setOpenLinkMode(OpenLinkMode.OPEN_IN_DESKTOP_APP);
} }
}, [openInAppService, remember, navigateHelper]); }, [openInAppService, remember]);
const onDismiss = useCallback(() => { const onDismiss = useCallback(() => {
openInAppService.dismissBanner( openInAppService.dismissBanner(

2
packages/frontend/core/src/modules/desktop-api/index.ts
View File

@@ -4,7 +4,7 @@ import {
WorkspaceScope, WorkspaceScope,
} from '@toeverything/infra'; } from '@toeverything/infra';
import { WorkbenchService } from '../workbench'; import { WorkbenchService } from '../workbench/services/workbench';
import { DesktopApi } from './entities/electron-api'; import { DesktopApi } from './entities/electron-api';
import { ElectronApiImpl } from './impl'; import { ElectronApiImpl } from './impl';
import { DesktopApiProvider } from './provider'; import { DesktopApiProvider } from './provider';

2
packages/frontend/core/src/modules/navigation/index.ts
View File

@@ -8,7 +8,7 @@ export { NavigationButtons } from './view/navigation-buttons';
import { type Framework, WorkspaceScope } from '@toeverything/infra'; import { type Framework, WorkspaceScope } from '@toeverything/infra';
import { WorkbenchService } from '../workbench'; import { WorkbenchService } from '../workbench/services/workbench';
import { Navigator } from './entities/navigator'; import { Navigator } from './entities/navigator';
import { NavigatorService } from './services/navigator'; import { NavigatorService } from './services/navigator';

2
packages/frontend/core/src/modules/userspace/index.ts
View File

@@ -3,7 +3,7 @@ export { UserspaceService as UserDBService } from './services/userspace';
import type { Framework } from '@toeverything/infra'; import type { Framework } from '@toeverything/infra';
import { AuthService, WebSocketService } from '../cloud'; import { AuthService, WebSocketService } from '../cloud';
import { DesktopApiService } from '../desktop-api'; import { DesktopApiService } from '../desktop-api/service/desktop-api';
import { CurrentUserDB } from './entities/current-user-db'; import { CurrentUserDB } from './entities/current-user-db';
import { UserDB } from './entities/user-db'; import { UserDB } from './entities/user-db';
import { UserDBEngine } from './entities/user-db-engine'; import { UserDBEngine } from './entities/user-db-engine';