Skip to content

Commit 6e88eea

Browse files
committed
Merge branch 'develop' of https://github.com/ssdeanx/AgentStack into develop
2 parents 0d93d8b + 48efbd4 commit 6e88eea

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

hooks/use-mobile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export function useIsMobile() {
77

88
React.useEffect(() => {
99
const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`)
10-
const onChange = () => {
11-
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)
10+
const onChange = (event: MediaQueryListEvent) => {
11+
setIsMobile(event.matches)
1212
}
1313
mql.addEventListener("change", onChange)
1414
setIsMobile(window.innerWidth < MOBILE_BREAKPOINT)

ui/select.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function SelectTrigger({
3737
data-slot="select-trigger"
3838
data-size={size}
3939
className={cn(
40-
"border-input data-placeholder:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
40+
"border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
4141
className
4242
)}
4343
{...props}
@@ -109,7 +109,7 @@ function SelectItem({
109109
<SelectPrimitive.Item
110110
data-slot="select-item"
111111
className={cn(
112-
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-disabled:pointer-events-none data-disa2bled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
112+
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
113113
className
114114
)}
115115
{...props}

ui/sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {
292292
title="Toggle Sidebar"
293293
className={cn(
294294
"hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex",
295-
"in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize",
295+
"group-data-[side=left]:cursor-w-resize group-data-[side=right]:cursor-e-resize",
296296
"[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
297297
"hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
298298
"[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",

ui/slider.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ function Slider({
1111
max = 100,
1212
...props
1313
}: React.ComponentProps<typeof SliderPrimitive.Root>) {
14+
const finalValue = value ?? defaultValue
1415
const _values = React.useMemo(
1516
() =>
16-
Array.isArray(value)
17-
? value
18-
: Array.isArray(defaultValue)
19-
? defaultValue
20-
: [min, max],
21-
[value, defaultValue, min, max]
17+
Array.isArray(finalValue)
18+
? finalValue
19+
: typeof finalValue === "number"
20+
? [finalValue]
21+
: [50], // Default to a single thumb
22+
[finalValue]
2223
)
2324

2425
return (

0 commit comments

Comments
 (0)