Skip to content

Filter results css #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions packages/web/src/app/search/components/filterPanel/entry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,30 @@ export const Entry = ({
},
onClicked,
}: EntryProps) => {

let countText = count.toString();
if (count > 999) {
countText = "999+";
}
return (
<div
className={clsx("flex flex-row items-center justify-between py-0.5 px-2 cursor-pointer rounded-md gap-2 select-none",
className={clsx(
"flex flex-row items-center justify-between py-0.5 px-2 cursor-pointer rounded-md gap-2 select-none",
{
"hover:bg-gray-200 dark:hover:bg-gray-700": !isSelected,
"bg-blue-200 dark:bg-blue-400": isSelected,
}
)}
onClick={() => onClicked()}
>
<div className="flex flex-row items-center gap-1">
<div className="flex flex-row items-center gap-1 overflow-hidden">
{Icon ? Icon : (
<QuestionMarkCircledIcon className="w-4 h-4 flex-shrink-0" />
)}
<p className="text-wrap">{displayName}</p>
<p className="overflow-hidden text-ellipsis whitespace-nowrap">{displayName}</p>
</div>
<div className="px-2 py-0.5 bg-gray-100 dark:bg-gray-800 text-sm rounded-md">
{countText}
</div>
<p>{count}</p>
</div>
);
}
Expand All @@ -53,4 +59,4 @@ export const compareEntries = (a: Entry, b: Entry) => {
}

return a.count - b.count;
}
}
16 changes: 10 additions & 6 deletions packages/web/src/app/search/components/filterPanel/filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,22 @@ import { compareEntries, Entry } from "./entry";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import Fuse from "fuse.js";
import { cn } from "@/lib/utils"

interface FilterProps {
title: string,
searchPlaceholder: string,
entries: Entry[],
onEntryClicked: (key: string) => void,
className?: string,
}

export const Filter = ({
title,
searchPlaceholder,
entries,
onEntryClicked,
className,
}: FilterProps) => {
const [searchFilter, setSearchFilter] = useState<string>("");

Expand All @@ -36,19 +39,20 @@ export const Filter = ({
}, [entries, searchFilter]);

return (
<div className="flex flex-col gap-2 p-1">
<div className={cn(
"flex flex-col gap-2 p-1",
className
)}>
<h2 className="text-sm font-semibold">{title}</h2>
<Input
placeholder={searchPlaceholder}
className="h-8"
onChange={(event) => setSearchFilter(event.target.value)}
/>

<ScrollArea
className="overflow-hidden"
>
<ScrollArea>
<div
className="flex flex-col gap-0.5 text-sm h-full max-h-80 px-0.5"
className="flex flex-col gap-0.5 text-sm px-0.5"
>
{filteredEntries
.sort((entryA, entryB) => compareEntries(entryB, entryA))
Expand All @@ -63,4 +67,4 @@ export const Filter = ({
</ScrollArea>
</div>
)
}
}
19 changes: 10 additions & 9 deletions packages/web/src/app/search/components/filterPanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,23 @@ export const FilterPanel = ({
onFilterChanged(filteredMatches);
}, [matches, repos, languages, onFilterChanged]);

const numRepos = Object.keys(repos).length > 100 ? '100+' : Object.keys(repos).length;
const numLanguages = Object.keys(languages).length > 100 ? '100+' : Object.keys(languages).length;
return (
<div className="p-3 flex flex-col gap-3">
<h1 className="text-lg font-semibold">Filter Results</h1>

<div className="p-3 flex flex-col gap-3 h-full">
<Filter
title="By Repository"
searchPlaceholder="Filter repositories"
title="Filter By Repository"
searchPlaceholder={`Filter ${numRepos} repositories`}
entries={Object.values(repos)}
onEntryClicked={(key) => onEntryClicked(key, setRepos)}
className="max-h-[50%]"
/>

<Filter
title="By Language"
searchPlaceholder="Filter languages"
title="Filter By Language"
searchPlaceholder={`Filter ${numLanguages} languages`}
entries={Object.values(languages)}
onEntryClicked={(key) => onEntryClicked(key, setLanguages)}
className="overflow-auto"
/>
</div>
)
Expand Down Expand Up @@ -167,4 +168,4 @@ const aggregateMatches = (
aggregation[key].count += 1;
return aggregation;
}, {} as Record<string, Entry>)
}
}
3 changes: 2 additions & 1 deletion packages/web/src/app/search/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ const PanelGroup = ({
return (
<ResizablePanelGroup
direction="horizontal"
className="h-full"
>
{/* ~~ Filter panel ~~ */}
<ResizablePanel
Expand Down Expand Up @@ -354,4 +355,4 @@ const PanelGroup = ({
</ResizablePanel>
</ResizablePanelGroup>
)
}
}
5 changes: 4 additions & 1 deletion packages/web/src/components/ui/resizable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ const ResizableHandle = ({
}) => (
<ResizablePrimitive.PanelResizeHandle
className={cn(
"relative flex w-px items-center justify-center bg-border after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90",
"relative flex w-px items-center justify-center bg-border",
"after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2",
"focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1",
"data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90",
className
)}
{...props}
Expand Down
Loading