Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-17 06:16:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): move openinapp guard to workspace scope (#9751)

Browse Source
This commit is contained in:
pengx17
2025-01-19 10:00:04 +00:00
parent 6ba802fb17
commit 7713920b71
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend/core/src/desktop/pages/open-app/index.tsx
View File

@@ -27,11 +27,12 @@ const OpenUrl = () => {
return null;
}
params.delete('url');
const urlObj = new URL(urlToOpen || '');
params.forEach((v, k) => {
if (k === 'url') {
return;
}
urlObj.searchParams.set(k, v);
});

17
packages/frontend/core/src/desktop/pages/workspace/index.tsx
View File

@@ -8,6 +8,7 @@ import {
import { GlobalDialogService } from '@affine/core/modules/dialogs';
import { DndService } from '@affine/core/modules/dnd/services';
import { GlobalContextService } from '@affine/core/modules/global-context';
import { OpenInAppGuard } from '@affine/core/modules/open-in-app';
import {
type Workspace,
type WorkspaceMetadata,
@@ -330,7 +331,9 @@ const WorkspacePage = ({ meta }: { meta: WorkspaceMetadata }) => {
return (
<FrameworkScope scope={workspace.scope}>
<DNDContextProvider>
<AppContainer fallback />
<OpenInAppGuard>
<AppContainer fallback />
</OpenInAppGuard>
</DNDContextProvider>
</FrameworkScope>
);
@@ -339,11 +342,13 @@ const WorkspacePage = ({ meta }: { meta: WorkspaceMetadata }) => {
return (
<FrameworkScope scope={workspace.scope}>
<DNDContextProvider>
<AffineErrorBoundary height="100vh">
<WorkspaceLayout>
<WorkbenchRoot />
</WorkspaceLayout>
</AffineErrorBoundary>
<OpenInAppGuard>
<AffineErrorBoundary height="100vh">
<WorkspaceLayout>
<WorkbenchRoot />
</WorkspaceLayout>
</AffineErrorBoundary>
</OpenInAppGuard>
</DNDContextProvider>
</FrameworkScope>
);