Skip to content

Commit fb3c17d

Browse files
committed
chore: update mobile header
1 parent 0dfcb1a commit fb3c17d

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

web/src/components/HomeSidebar/HomeSidebarDrawer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Drawer } from "@mui/joy";
22
import { Button } from "@usememos/mui";
3-
import { SearchIcon } from "lucide-react";
3+
import { MenuIcon } from "lucide-react";
44
import { useEffect, useState } from "react";
55
import { useLocation } from "react-router-dom";
66
import HomeSidebar from "./HomeSidebar";
@@ -24,7 +24,7 @@ const HomeSidebarDrawer = () => {
2424
return (
2525
<>
2626
<Button variant="plain" className="!bg-transparent px-2" onClick={toggleDrawer(true)}>
27-
<SearchIcon className="w-5 h-auto dark:text-gray-400" />
27+
<MenuIcon className="w-6 h-auto dark:text-gray-400" />
2828
</Button>
2929
<Drawer anchor="right" size="sm" open={open} onClose={toggleDrawer(false)}>
3030
<div className="w-full h-full bg-zinc-100 dark:bg-zinc-900">

web/src/components/MobileHeader.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import useWindowScroll from "react-use/lib/useWindowScroll";
22
import useResponsiveWidth from "@/hooks/useResponsiveWidth";
3-
import { workspaceStore } from "@/store/v2";
43
import { cn } from "@/utils";
54
import NavigationDrawer from "./NavigationDrawer";
65

@@ -13,7 +12,6 @@ const MobileHeader = (props: Props) => {
1312
const { className, children } = props;
1413
const { sm } = useResponsiveWidth();
1514
const { y: offsetTop } = useWindowScroll();
16-
const workspaceGeneralSetting = workspaceStore.state.generalSetting;
1715

1816
return (
1917
<div
@@ -23,15 +21,7 @@ const MobileHeader = (props: Props) => {
2321
className,
2422
)}
2523
>
26-
<div className="flex flex-row justify-start items-center mr-2 shrink-0 overflow-hidden">
27-
{!sm && <NavigationDrawer />}
28-
<span
29-
className="font-bold text-lg leading-10 mr-1 text-ellipsis shrink-0 cursor-pointer overflow-hidden text-gray-700 dark:text-gray-300"
30-
onDoubleClick={() => location.reload()}
31-
>
32-
{workspaceGeneralSetting.customProfile?.title || "Memos"}
33-
</span>
34-
</div>
24+
<div className="flex flex-row justify-start items-center mr-2 shrink-0 overflow-hidden">{!sm && <NavigationDrawer />}</div>
3525
<div className="flex flex-row justify-end items-center">{children}</div>
3626
</div>
3727
);

web/src/components/NavigationDrawer.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
import { Drawer } from "@mui/joy";
22
import { Button } from "@usememos/mui";
3-
import { MenuIcon } from "lucide-react";
3+
import { observer } from "mobx-react-lite";
44
import { useEffect, useState } from "react";
55
import { useLocation } from "react-router-dom";
6+
import { workspaceStore } from "@/store/v2";
67
import Navigation from "./Navigation";
8+
import UserAvatar from "./UserAvatar";
79

8-
const NavigationDrawer = () => {
10+
const NavigationDrawer = observer(() => {
911
const location = useLocation();
1012
const [open, setOpen] = useState(false);
13+
const workspaceGeneralSetting = workspaceStore.state.generalSetting;
14+
const title = workspaceGeneralSetting.customProfile?.title || "Memos";
15+
const avatarUrl = workspaceGeneralSetting.customProfile?.logoUrl || "/full-logo.webp";
1116

1217
useEffect(() => {
1318
setOpen(false);
@@ -23,8 +28,11 @@ const NavigationDrawer = () => {
2328

2429
return (
2530
<>
26-
<Button variant="plain" className="!bg-transparent px-2" onClick={toggleDrawer(true)}>
27-
<MenuIcon className="w-5 h-auto dark:text-gray-400" />
31+
<Button variant="plain" className="px-2" onClick={toggleDrawer(true)}>
32+
<UserAvatar className="shrink-0 w-6 h-6 rounded-md" avatarUrl={avatarUrl} />
33+
<span className="font-bold text-lg leading-10 ml-2 text-ellipsis shrink-0 cursor-pointer overflow-hidden text-gray-700 dark:text-gray-300">
34+
{title}
35+
</span>
2836
</Button>
2937
<Drawer anchor="left" size="sm" open={open} onClose={toggleDrawer(false)}>
3038
<div className="w-full h-full overflow-auto px-2 bg-zinc-100 dark:bg-zinc-900">
@@ -33,6 +41,6 @@ const NavigationDrawer = () => {
3341
</Drawer>
3442
</>
3543
);
36-
};
44+
});
3745

3846
export default NavigationDrawer;

0 commit comments

Comments
 (0)