fix: a series of setting issues (#3032)

(cherry picked from commit 87ba71e77e)
This commit is contained in:
Qi
2023-07-05 22:11:42 +08:00
committed by Alex Yang
parent 0a607e0450
commit 8f1bfa46a9
24 changed files with 235 additions and 463 deletions
@@ -1,18 +1,14 @@
import { UserAvatar } from '@affine/component/user-avatar';
import { WorkspaceAvatar } from '@affine/component/workspace-avatar';
import type {
AffineCloudWorkspace,
LocalWorkspace,
} from '@affine/env/workspace';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { useBlockSuiteWorkspaceName } from '@toeverything/hooks/use-block-suite-workspace-name';
import clsx from 'clsx';
import type { AllWorkspace } from '../../../../shared';
import type {
GeneralSettingKeys,
GeneralSettingList,
} from '../general-setting';
import type { Workspace } from '../type';
import {
accountButton,
settingSlideBar,
@@ -34,13 +30,11 @@ export const SettingSidebar = ({
}: {
generalSettingList: GeneralSettingList;
onGeneralSettingClick: (key: GeneralSettingKeys) => void;
currentWorkspace: Workspace;
workspaceList: Workspace[];
onWorkspaceSettingClick: (
workspace: AffineCloudWorkspace | LocalWorkspace
) => void;
currentWorkspace: AllWorkspace;
workspaceList: AllWorkspace[];
onWorkspaceSettingClick: (workspace: AllWorkspace) => void;
selectedWorkspace: Workspace | null;
selectedWorkspace: AllWorkspace | null;
selectedGeneralKey: string | null;
onAccountSettingClick: () => void;
}) => {
@@ -118,7 +112,7 @@ const WorkspaceListItem = ({
isCurrent,
isActive,
}: {
workspace: AffineCloudWorkspace | LocalWorkspace;
workspace: AllWorkspace;
onClick: () => void;
isCurrent: boolean;
isActive: boolean;
@@ -34,6 +34,7 @@ export const sidebarItemsWrapper = style({
selectors: {
'&.scroll': {
flexGrow: 1,
overflowY: 'auto',
},
},
});