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

fix(core): correct the suspense behavior (#3789)

Browse Source
This commit is contained in:
Alex Yang
2023-08-16 16:42:35 -05:00
committed by GitHub
parent 804b8f38b8
commit f369ca39f7
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/core/src/components/affine/setting-modal/index.tsx
View File

@@ -1,10 +1,11 @@
import { import {
SettingModal as SettingModalBase, SettingModal as SettingModalBase,
type SettingModalProps as SettingModalBaseProps, type SettingModalProps as SettingModalBaseProps,
WorkspaceDetailSkeleton,
} from '@affine/component/setting-components'; } from '@affine/component/setting-components';
import { useAFFiNEI18N } from '@affine/i18n/hooks'; import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { ContactWithUsIcon } from '@blocksuite/icons'; import { ContactWithUsIcon } from '@blocksuite/icons';
import { useCallback } from 'react'; import { Suspense, useCallback } from 'react';
import { AccountSetting } from './account-setting'; import { AccountSetting } from './account-setting';
import { import {
@@ -77,7 +78,9 @@ export const SettingModal = ({
<div className="wrapper"> <div className="wrapper">
<div className="content"> <div className="content">
{activeTab === 'workspace' && workspaceId ? ( {activeTab === 'workspace' && workspaceId ? (
<WorkspaceSetting key={workspaceId} workspaceId={workspaceId} /> <Suspense fallback={<WorkspaceDetailSkeleton />}>
<WorkspaceSetting key={workspaceId} workspaceId={workspaceId} />
</Suspense>
) : null} ) : null}
{generalSettingList.find(v => v.key === activeTab) ? ( {generalSettingList.find(v => v.key === activeTab) ? (
<GeneralSetting generalKey={activeTab as GeneralSettingKeys} /> <GeneralSetting generalKey={activeTab as GeneralSettingKeys} />

15
apps/core/src/components/affine/setting-modal/workspace-setting/index.tsx
View File

@@ -1,7 +1,6 @@
import { WorkspaceDetailSkeleton } from '@affine/component/setting-components';
import { usePassiveWorkspaceEffect } from '@toeverything/infra/__internal__/react'; import { usePassiveWorkspaceEffect } from '@toeverything/infra/__internal__/react';
import { useSetAtom } from 'jotai'; import { useSetAtom } from 'jotai';
import { Suspense, useCallback } from 'react'; import { useCallback } from 'react';
import { getUIAdapter } from '../../../../adapters/workspace'; import { getUIAdapter } from '../../../../adapters/workspace';
import { openSettingModalAtom } from '../../../../atoms'; import { openSettingModalAtom } from '../../../../atoms';
@@ -33,12 +32,10 @@ export const WorkspaceSetting = ({ workspaceId }: { workspaceId: string }) => {
const onTransformWorkspace = useOnTransformWorkspace(); const onTransformWorkspace = useOnTransformWorkspace();
return ( return (
<Suspense fallback={<WorkspaceDetailSkeleton />}> <NewSettingsDetail
<NewSettingsDetail onTransformWorkspace={onTransformWorkspace}
onTransformWorkspace={onTransformWorkspace} onDeleteWorkspace={onDeleteWorkspace}
onDeleteWorkspace={onDeleteWorkspace} currentWorkspaceId={workspaceId}
currentWorkspaceId={workspaceId} />
/>
</Suspense>
); );
}; };