feat(core): adjust app sidebar's style (#6162)

This commit is contained in:
CatsJuice
2024-03-25 10:25:48 +00:00
parent 2a019d4fae
commit b2f34d17a2
6 changed files with 36 additions and 36 deletions

View File

@@ -18,7 +18,7 @@ import {
import { useAtom, useAtomValue, useSetAtom } from 'jotai';
import type { PropsWithChildren, ReactNode } from 'react';
import { lazy, Suspense, useCallback, useEffect, useState } from 'react';
import { matchPath, useParams } from 'react-router-dom';
import { matchPath } from 'react-router-dom';
import { Map as YMap } from 'yjs';
import { openQuickSearchModalAtom, openSettingModalAtom } from '../atoms';
@@ -152,10 +152,6 @@ export const WorkspaceLayoutInner = ({ children }: PropsWithChildren) => {
const handleDragEnd = useSidebarDrag();
const { appSettings } = useAppSettingHelper();
const { pageId } = useParams();
// todo: refactor this that the root layout do not need to check route state
const isInPageDetail = !!pageId;
const upgradeStatus = useWorkspaceStatus(currentWorkspace, s => s.upgrade);
@@ -185,10 +181,7 @@ export const WorkspaceLayoutInner = ({ children }: PropsWithChildren) => {
paths={pathGenerator}
/>
</Suspense>
<MainContainer
transparent={isInPageDetail}
padding={appSettings.clientBorder}
>
<MainContainer clientBorder={appSettings.clientBorder}>
<Suspense>
{upgradeStatus?.needUpgrade || upgradeStatus?.upgrading ? (
<WorkspaceUpgrade />