diff --git a/web/src/routes/Main/Content/Group/Sidebar.tsx b/web/src/routes/Main/Content/Group/Sidebar.tsx index 670d7c61..4c5c87f4 100644 --- a/web/src/routes/Main/Content/Group/Sidebar.tsx +++ b/web/src/routes/Main/Content/Group/Sidebar.tsx @@ -35,7 +35,7 @@ export const Sidebar: React.FC = React.memo(() => { ); return ( -
+
diff --git a/web/src/routes/Main/Content/Group/index.tsx b/web/src/routes/Main/Content/Group/index.tsx index 22638ff6..6cce469a 100644 --- a/web/src/routes/Main/Content/Group/index.tsx +++ b/web/src/routes/Main/Content/Group/index.tsx @@ -7,7 +7,7 @@ import { Sidebar } from './Sidebar'; export const Group: React.FC = React.memo(() => { return ( - }> + }> (
{props.children}
); -interface PageContentProps { - sidebar?: React.ReactNode; -} - const PageGestureWrapper: React.FC = React.memo((props) => { const { setShowSidebar } = useSidebarContext(); @@ -36,6 +32,10 @@ const PageGestureWrapper: React.FC = React.memo((props) => { }); PageGestureWrapper.displayName = 'PageGestureWrapper'; +interface PageContentProps { + sidebar?: React.ReactNode; + 'data-tc-role'?: string; +} /** * 用于渲染实际页面的组件,即除了导航栏剩余的内容 */ @@ -85,7 +85,10 @@ export const PageContent: React.FC = React.memo((props) => { <> {sidebarEl} -
+
{contentMaskEl} {contentEl}
diff --git a/web/src/routes/Main/Content/Personal/Sidebar.tsx b/web/src/routes/Main/Content/Personal/Sidebar.tsx index da469d7e..1a656006 100644 --- a/web/src/routes/Main/Content/Personal/Sidebar.tsx +++ b/web/src/routes/Main/Content/Personal/Sidebar.tsx @@ -32,7 +32,7 @@ export const PersonalSidebar: React.FC = React.memo(() => { const userInfo = useUserInfo(); return ( -
+
{userInfo?.nickname}
diff --git a/web/src/routes/Main/Content/Personal/index.tsx b/web/src/routes/Main/Content/Personal/index.tsx index 7f90b26b..16a0ccda 100644 --- a/web/src/routes/Main/Content/Personal/index.tsx +++ b/web/src/routes/Main/Content/Personal/index.tsx @@ -8,7 +8,7 @@ import { PersonalSidebar } from './Sidebar'; export const Personal: React.FC = React.memo(() => { return ( - }> + }> diff --git a/web/src/routes/Main/Navbar/GroupNav.tsx b/web/src/routes/Main/Navbar/GroupNav.tsx index 71ece9fa..69c71faa 100644 --- a/web/src/routes/Main/Navbar/GroupNav.tsx +++ b/web/src/routes/Main/Navbar/GroupNav.tsx @@ -38,7 +38,7 @@ export const GroupNav: React.FC = React.memo(() => { }, []); return ( -
+
{Array.isArray(groups) && groups.map((group) => (
diff --git a/web/src/routes/Main/Navbar/PersonalNav.tsx b/web/src/routes/Main/Navbar/PersonalNav.tsx index dfa5e14f..33b45685 100644 --- a/web/src/routes/Main/Navbar/PersonalNav.tsx +++ b/web/src/routes/Main/Navbar/PersonalNav.tsx @@ -16,19 +16,21 @@ export const PersonalNav: React.FC = React.memo(() => { const unread = usePersonalUnread(); return ( - - - +
+ + + +
); }); PersonalNav.displayName = 'PersonalNav'; diff --git a/web/src/routes/Main/Navbar/index.tsx b/web/src/routes/Main/Navbar/index.tsx index 298110c3..0d47c9c8 100644 --- a/web/src/routes/Main/Navbar/index.tsx +++ b/web/src/routes/Main/Navbar/index.tsx @@ -10,7 +10,10 @@ import { PersonalNav } from './PersonalNav'; */ export const Navbar: React.FC = React.memo(() => { return ( -
+
{/* Navbar */} @@ -24,7 +27,7 @@ export const Navbar: React.FC = React.memo(() => {
-
+