Skip to content

Commit be80e36

Browse files
refactor(web): add SidebarInput (pingdotgg#13028)
Co-authored-by: Claude Fable 5 <[email protected]>
1 parent 7b54af9 commit be80e36

4 files changed

Lines changed: 23 additions & 10 deletions

File tree

‎apps/web/src/components/settings/SettingsSidebarNav.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
import { useLocation, useNavigate } from "@tanstack/react-router";
2828

2929
import { Button } from "../ui/button";
30-
import { Input } from "../ui/input";
3130
import { Kbd } from "../ui/kbd";
3231
import {
3332
SidebarContent,
@@ -37,6 +36,7 @@ import {
3736
SidebarMenuButton,
3837
SidebarMenuItem,
3938
useSidebar,
39+
SidebarInput,
4040
} from "../ui/sidebar";
4141
import { SidebarUtilityMenu } from "../sidebar/SidebarChrome";
4242
import { scrollToSettingsTarget } from "./settingsLayout";
@@ -237,10 +237,9 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
237237
<SidebarGroup className="gap-2 p-[var(--sidebar-content-inset)]">
238238
<div className="flex h-8 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground">
239239
<SearchIcon className="size-4 shrink-0 text-sidebar-muted-foreground/80" />
240-
<Input
240+
<SidebarInput
241241
ref={searchInputRef}
242242
nativeInput
243-
unstyled
244243
type="search"
245244
value={query}
246245
onChange={(event) => {
@@ -259,7 +258,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
259258
? `settings-search-result-${results[activeResultIndex].id}`
260259
: undefined
261260
}
262-
className="min-w-0 flex-1 [&_[data-slot=input]]:h-auto [&_[data-slot=input]]:p-0 [&_[data-slot=input]]:leading-normal [&_[data-slot=input]]:text-sm [&_[data-slot=input]]:font-medium [&_[data-slot=input]]:text-sidebar-foreground [&_[data-slot=input]]:placeholder:text-sidebar-muted-foreground"
261+
className="min-w-0 flex-1"
263262
/>
264263
{isSearching ? (
265264
<Button

‎apps/web/src/components/sidebar/SidebarThreadHeader.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ import {
2121

2222
import { cn } from "~/lib/utils";
2323
import { Button } from "../ui/button";
24-
import { Input } from "../ui/input";
25-
import { SidebarMenuButton } from "../ui/sidebar";
24+
import { SidebarInput, SidebarMenuButton } from "../ui/sidebar";
2625
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
2726

2827
export interface SidebarThreadHeaderProps {
@@ -85,10 +84,9 @@ export function SidebarThreadHeader({
8584
className="flex h-8 min-w-0 flex-1 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
8685
>
8786
<SearchIcon className="size-4 shrink-0 text-[var(--sidebar-icon-color)]" />
88-
<Input
87+
<SidebarInput
8988
ref={searchInputRef}
9089
nativeInput
91-
unstyled
9290
type="search"
9391
value={searchQuery}
9492
onChange={(event) => onSearchQueryChange(event.currentTarget.value)}
@@ -104,7 +102,7 @@ export function SidebarThreadHeader({
104102
? `sidebar-thread-search-result-${activeSearchResultIndex}`
105103
: undefined
106104
}
107-
className="min-w-0 flex-1 [&_[data-slot=input]]:h-auto [&_[data-slot=input]]:p-0 [&_[data-slot=input]]:leading-normal [&_[data-slot=input]]:text-sm [&_[data-slot=input]]:font-medium [&_[data-slot=input]]:text-sidebar-foreground [&_[data-slot=input]]:placeholder:text-[var(--sidebar-icon-color)]"
105+
className="min-w-0 flex-1"
108106
/>
109107
{isSearching ? (
110108
<Button

‎apps/web/src/components/ui/sidebar.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { PanelLeftCloseIcon, PanelLeftIcon } from "lucide-react";
55
import * as React from "react";
66
import { cn } from "~/lib/utils";
77
import { Button } from "~/components/ui/button";
8+
import { Input, type InputProps } from "~/components/ui/input";
89
import { ScrollArea } from "~/components/ui/scroll-area";
910
import {
1011
Sheet,
@@ -530,6 +531,20 @@ function SidebarRail({
530531
);
531532
}
532533

534+
/** A bare search or rename field that sits in a row of sidebar chrome. */
535+
function SidebarInput({ className, ...props }: Omit<InputProps, "unstyled" | "variant">) {
536+
return (
537+
<Input
538+
className={cn(
539+
"[&_[data-slot=input]]:h-auto [&_[data-slot=input]]:p-0 [&_[data-slot=input]]:font-medium [&_[data-slot=input]]:text-sidebar-foreground [&_[data-slot=input]]:text-sm [&_[data-slot=input]]:leading-normal [&_[data-slot=input]]:placeholder:text-sidebar-muted-foreground",
540+
className,
541+
)}
542+
unstyled
543+
{...props}
544+
/>
545+
);
546+
}
547+
533548
function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
534549
return (
535550
<main
@@ -770,6 +785,7 @@ function SidebarMenuSubButton({
770785
}
771786

772787
export {
788+
SidebarInput,
773789
Sidebar,
774790
SidebarContent,
775791
SidebarFooter,

‎scripts/lint-restyle-ceiling.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as NodeURL from "node:url";
88
// components/ui exports are migrated to variants (see vite.config.ts). This gate keeps the
99
// count from growing: CI fails when findings exceed the ceiling. Lower the ceiling when you
1010
// migrate a file, and delete this script when the rule becomes an error.
11-
export const RESTYLE_CEILING = 1043;
11+
export const RESTYLE_CEILING = 1031;
1212

1313
const RULE = "shadcn(no-restyle)";
1414

0 commit comments

Comments
 (0)