Skip to content
Merged
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
71 changes: 50 additions & 21 deletions apps/web/src/components/WorkspaceFileTree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
FolderClosedIcon,
FolderIcon,
SearchIcon,
SlidersHorizontalIcon,
TriangleAlertIcon,
} from "lucide-react";
import { memo, useCallback, useDeferredValue, useState } from "react";
Expand All @@ -18,6 +19,7 @@ import { cn } from "~/lib/utils";
import { readNativeApi } from "~/nativeApi";
import { resolvePathLinkTarget } from "~/terminal-links";
import { VscodeEntryIcon } from "./chat/VscodeEntryIcon";
import { Collapsible, CollapsibleContent } from "./ui/collapsible";
import { Input } from "./ui/input";
import { InputGroup, InputGroupAddon, InputGroupInput } from "./ui/input-group";
import { toastManager } from "./ui/toast";
Expand All @@ -34,6 +36,7 @@ export const WorkspaceFileTree = memo(function WorkspaceFileTree(props: {
const [searchQuery, setSearchQuery] = useState("");
const [includePattern, setIncludePattern] = useState("");
const [excludePattern, setExcludePattern] = useState("");
const [filtersOpen, setFiltersOpen] = useState(false);
const deferredSearchQuery = useDeferredValue(searchQuery);
const deferredIncludePattern = useDeferredValue(includePattern);
const deferredExcludePattern = useDeferredValue(excludePattern);
Expand All @@ -46,6 +49,9 @@ export const WorkspaceFileTree = memo(function WorkspaceFileTree(props: {
}, []);

const openFileInViewer = useCodeViewerStore((state) => state.openFile);
const filtersHaveContent = includePattern.trim().length > 0 || excludePattern.trim().length > 0;
const filtersVisible = filtersOpen || filtersHaveContent;

const searchActive =
deferredSearchQuery.trim().length > 0 ||
deferredIncludePattern.trim().length > 0 ||
Expand Down Expand Up @@ -104,6 +110,7 @@ export const WorkspaceFileTree = memo(function WorkspaceFileTree(props: {
setSearchQuery("");
setIncludePattern("");
setExcludePattern("");
setFiltersOpen(false);
}, []);

return (
Expand All @@ -121,28 +128,50 @@ export const WorkspaceFileTree = memo(function WorkspaceFileTree(props: {
spellCheck={false}
aria-label="Search files"
/>
<InputGroupAddon align="inline-end">
<button
type="button"
onClick={() => setFiltersOpen((prev) => !prev)}
aria-label="Toggle file filters"
aria-expanded={filtersVisible}
className={cn(
"flex size-6 items-center justify-center rounded-md transition-colors hover:bg-accent/60",
filtersHaveContent && "text-foreground",
)}
>
<SlidersHorizontalIcon
className={cn(
"size-3.5",
filtersHaveContent
? "text-foreground"
: "text-muted-foreground/65",
)}
/>
</button>
</InputGroupAddon>
</InputGroup>
<div className="grid gap-1.5">
<Input
size="sm"
value={includePattern}
onChange={(event) => setIncludePattern(event.target.value)}
placeholder="Include: src/**, *.{ts,tsx}"
spellCheck={false}
aria-label="Files to include"
/>
<Input
size="sm"
value={excludePattern}
onChange={(event) => setExcludePattern(event.target.value)}
placeholder="Exclude: dist/**, *.snap"
spellCheck={false}
aria-label="Files to exclude"
/>
</div>
<p className="text-[10px] text-muted-foreground/55">
CamelCase, path-ordered, and glob-restricted search.
</p>
<Collapsible open={filtersVisible}>
<CollapsibleContent>
<div className="grid gap-1.5 pt-1.5">
<Input
size="sm"
value={includePattern}
onChange={(event) => setIncludePattern(event.target.value)}
placeholder="Include: src/**, *.{ts,tsx}"
spellCheck={false}
aria-label="Files to include"
/>
<Input
size="sm"
value={excludePattern}
onChange={(event) => setExcludePattern(event.target.value)}
placeholder="Exclude: dist/**, *.snap"
spellCheck={false}
aria-label="Files to exclude"
/>
</div>
</CollapsibleContent>
</Collapsible>
</div>

{searchActive ? (
Expand Down
Loading