From 3a0e55d6e47810103354212abbaabd84196c58bf Mon Sep 17 00:00:00 2001 From: Duosi-Dai Date: Thu, 3 Oct 2024 22:42:43 +0200 Subject: [PATCH 1/4] filter textAlignLeft fixed --- src/app/student/_components/MultiSelect.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/student/_components/MultiSelect.tsx b/src/app/student/_components/MultiSelect.tsx index d7d1538..14c4748 100644 --- a/src/app/student/_components/MultiSelect.tsx +++ b/src/app/student/_components/MultiSelect.tsx @@ -1,5 +1,8 @@ import BadgeCollection from "@/app/student/exhibitors/_components/BadgeCollection" -import { Filter, FilterItem } from "@/app/student/lib/filters" +import { + Filter, + FilterItem +} from "@/app/student/exhibitors/_components/ExhibitorListFilteringHeader" import { useScreenSize } from "@/components/shared/hooks/useScreenSize" import { Button } from "@/components/ui/button" import { Checkbox } from "@/components/ui/checkbox" @@ -14,6 +17,9 @@ import { ScrollArea } from "@/components/ui/scroll-area" import { ChevronDown, X } from "lucide-react" import { useRef, useState } from "react" +// TODO: +// - keyboard navigation? + export default function MultiSelect({ filter, onChange @@ -108,7 +114,7 @@ export default function MultiSelect({ role="option" aria-selected={isSelected(item)} key={item.id} - className="flex min-w-32 cursor-default items-center gap-2 p-2 pl-3 hover:bg-emerald-950 hover:text-melon-700" + className="hover:text-melon-700g flex min-w-32 cursor-default items-center gap-2 p-2 pl-3 text-left hover:bg-emerald-950" onClick={() => onSelectionChange(item)}> {item.name} From ba0111f0bd3f576812d9f0372b5ab2acbe702eab Mon Sep 17 00:00:00 2001 From: Duosi-Dai Date: Thu, 10 Oct 2024 20:06:22 +0200 Subject: [PATCH 2/4] industry filter text style fixed --- src/app/student/_components/MultiSelect.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/student/_components/MultiSelect.tsx b/src/app/student/_components/MultiSelect.tsx index 14c4748..ce02e8e 100644 --- a/src/app/student/_components/MultiSelect.tsx +++ b/src/app/student/_components/MultiSelect.tsx @@ -114,7 +114,7 @@ export default function MultiSelect({ role="option" aria-selected={isSelected(item)} key={item.id} - className="hover:text-melon-700g flex min-w-32 cursor-default items-center gap-2 p-2 pl-3 text-left hover:bg-emerald-950" + className="flex min-w-32 cursor-default items-center gap-2 p-2 pl-3 text-left hover:bg-emerald-950 hover:text-melon-700" onClick={() => onSelectionChange(item)}> {item.name} From fc3f4a7d32dd19cbaab2b9762ee70ef38546cfd7 Mon Sep 17 00:00:00 2001 From: DuosiPrivate <78415606+Duosi-Dai@users.noreply.github.com> Date: Thu, 10 Oct 2024 20:22:45 +0200 Subject: [PATCH 3/4] Update MultiSelect.tsx fix import issue --- src/app/student/_components/MultiSelect.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/student/_components/MultiSelect.tsx b/src/app/student/_components/MultiSelect.tsx index ce02e8e..6c6e28b 100644 --- a/src/app/student/_components/MultiSelect.tsx +++ b/src/app/student/_components/MultiSelect.tsx @@ -2,7 +2,7 @@ import BadgeCollection from "@/app/student/exhibitors/_components/BadgeCollectio import { Filter, FilterItem -} from "@/app/student/exhibitors/_components/ExhibitorListFilteringHeader" +} from "@/app/student/lib/filters" import { useScreenSize } from "@/components/shared/hooks/useScreenSize" import { Button } from "@/components/ui/button" import { Checkbox } from "@/components/ui/checkbox" From b5ab635bb62542ad838664df37de7827d4a3b3c4 Mon Sep 17 00:00:00 2001 From: Duosi-Dai Date: Thu, 10 Oct 2024 20:25:24 +0200 Subject: [PATCH 4/4] import style fix --- src/app/student/_components/MultiSelect.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/app/student/_components/MultiSelect.tsx b/src/app/student/_components/MultiSelect.tsx index 6c6e28b..f1c985c 100644 --- a/src/app/student/_components/MultiSelect.tsx +++ b/src/app/student/_components/MultiSelect.tsx @@ -1,8 +1,5 @@ import BadgeCollection from "@/app/student/exhibitors/_components/BadgeCollection" -import { - Filter, - FilterItem -} from "@/app/student/lib/filters" +import { Filter, FilterItem } from "@/app/student/lib/filters" import { useScreenSize } from "@/components/shared/hooks/useScreenSize" import { Button } from "@/components/ui/button" import { Checkbox } from "@/components/ui/checkbox"