Skip to content

Commit 8f4ef74

Browse files
authored
Merge pull request #15 from m-danya/frontend-mobile-fixes
Frontend mobile fixes
2 parents 9701396 + 0d686bc commit 8f4ef74

File tree

7 files changed

+26
-9
lines changed

7 files changed

+26
-9
lines changed

frontend/components/left-panel/logo.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import Image from "next/image";
22
import Link from "next/link";
3+
import { useSidebar } from "@/components/ui/sidebar";
4+
35
export function Logo() {
6+
const { setOpenMobile } = useSidebar();
7+
48
return (
59
<div className="flex justify-center w-full">
610
<div className="w-40">
7-
<Link href="/">
11+
<Link href="/" onClick={() => setOpenMobile(false)}>
812
<Image
913
src="/logo_hor.png"
1014
className="w-full h-auto"

frontend/components/left-panel/main-sidebar-wrapper.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ export function MainSidebarWrapper({
1616
<AppSidebar />
1717
<SidebarInset>
1818
<header className="flex h-14 shrink-0 items-center gap-2">
19-
<div className="flex flex-1 items-center gap-2 px-3">
19+
<div className="flex flex-1 items-center gap-2 px-5">
2020
<SidebarTrigger />
2121
</div>
22-
<div className="ml-auto px-3">{/* <NavActions /> */}</div>
2322
</header>
24-
<div>{children}</div>
23+
<div className="px-5">{children}</div>
2524
</SidebarInset>
2625
</SidebarProvider>
2726
);

frontend/components/left-panel/nav-main.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
SidebarMenu,
77
SidebarMenuButton,
88
SidebarMenuItem,
9+
useSidebar,
910
} from "@/components/ui/sidebar";
1011
import Link from "next/link";
1112

@@ -19,12 +20,14 @@ export function NavMain({
1920
isActive?: boolean;
2021
}[];
2122
}) {
23+
const { setOpenMobile } = useSidebar();
24+
2225
return (
2326
<SidebarMenu>
2427
{items.map((item) => (
2528
<SidebarMenuItem key={item.title}>
2629
<SidebarMenuButton asChild isActive={item.isActive}>
27-
<Link href={item.url}>
30+
<Link href={item.url} onClick={() => setOpenMobile(false)}>
2831
<item.icon />
2932
<span>{item.title}</span>
3033
</Link>

frontend/components/left-panel/nav-secondary.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
SidebarMenuBadge,
88
SidebarMenuButton,
99
SidebarMenuItem,
10+
useSidebar,
1011
} from "@/components/ui/sidebar";
1112

1213
import Link from "next/link";
@@ -23,14 +24,16 @@ export function NavSecondary({
2324
badge?: React.ReactNode;
2425
}[];
2526
} & React.ComponentPropsWithoutRef<typeof SidebarGroup>) {
27+
const { setOpenMobile } = useSidebar();
28+
2629
return (
2730
<SidebarGroup {...props}>
2831
<SidebarGroupContent>
2932
<SidebarMenu>
3033
{items.map((item) => (
3134
<SidebarMenuItem key={item.title}>
3235
<SidebarMenuButton asChild>
33-
<Link href={item.url}>
36+
<Link href={item.url} onClick={() => setOpenMobile(false)}>
3437
<item.icon />
3538
<span>{item.title}</span>
3639
</Link>

frontend/components/left-panel/nav-sections.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
SidebarMenuButton,
1919
SidebarMenuItem,
2020
SidebarMenuSub,
21+
useSidebar,
2122
} from "@/components/ui/sidebar";
2223
import { Skeleton } from "@/components/ui/skeleton";
2324
import { ArrowDownUp, ChevronRight, Pencil, Plus, Trash } from "lucide-react";
@@ -267,9 +268,11 @@ const TreeElement = ({
267268
const displayFullIdent = !withChevron && withIdentIfNoChevron;
268269
const displayMiniIdent = !withChevron && !withIdentIfNoChevron;
269270
const router = useRouter();
271+
const { setOpenMobile } = useSidebar();
270272

271273
const handleClick = () => {
272274
if (clickable) {
275+
setOpenMobile(false);
273276
router.push(`/section/${section.id}`);
274277
}
275278
};

frontend/components/tasks/section.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ export function Section({ sectionId }: { sectionId: string }) {
5858
}, [section]);
5959

6060
const dndSensors = useSensors(
61-
useSensor(MouseSensor),
61+
useSensor(MouseSensor, {
62+
activationConstraint: {
63+
distance: 5,
64+
},
65+
}),
6266
useSensor(TouchSensor, {
63-
activationConstraint: { distance: 5, delay: 100 },
67+
activationConstraint: { distance: 5, delay: 500 },
6468
})
6569
);
6670

frontend/components/ui/sidebar.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { cn } from "@/lib/utils";
1010
import { Button } from "@/components/ui/button";
1111
import { Input } from "@/components/ui/input";
1212
import { Separator } from "@/components/ui/separator";
13-
import { Sheet, SheetContent } from "@/components/ui/sheet";
13+
import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet";
1414
import { Skeleton } from "@/components/ui/skeleton";
1515
import {
1616
Tooltip,
@@ -196,6 +196,7 @@ const Sidebar = React.forwardRef<
196196
if (isMobile) {
197197
return (
198198
<Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
199+
<SheetTitle className="hidden"></SheetTitle>
199200
<SheetContent
200201
data-sidebar="sidebar"
201202
data-mobile="true"

0 commit comments

Comments
 (0)