🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor BucketSelection component for improved UI consistency and accessibility
Bill Yang6d0ab3a3d913
diff --git a/client/src/components/BucketSelection.tsx b/client/src/components/BucketSelection.tsxindex 2f25dec59..bc241f05e 100644--- a/client/src/components/BucketSelection.tsx+++ b/client/src/components/BucketSelection.tsx@@ -4,6 +4,7 @@ import { useStore } from "@/lib/store";import { SelectItem, Select, SelectContent, SelectTrigger, SelectValue } from "@/components/ui/select";import { DateTime } from "luxon";import { Time } from "./DateSelector/types";+import { TimerReset } from "lucide-react";const getOptions = (time: Time) => {if (time.mode === "past-minutes") {@@ -11,13 +12,13 @@ const getOptions = (time: Time) => {return (<SelectContent><SelectItem size="sm" value="minute">- Minute+ Min</SelectItem><SelectItem size="sm" value="five_minutes">- 5 Minutes+ 5 Min</SelectItem><SelectItem size="sm" value="fifteen_minutes">- 15 Minutes+ 15 Min</SelectItem><SelectItem size="sm" value="hour">Hour@@ -38,7 +39,7 @@ const getOptions = (time: Time) => {return (<SelectContent><SelectItem size="sm" value="minute">- Minute+ Min</SelectItem></SelectContent>);@@ -47,13 +48,13 @@ const getOptions = (time: Time) => {return (<SelectContent><SelectItem size="sm" value="minute">- Minute+ Min</SelectItem><SelectItem size="sm" value="five_minutes">- 5 Minutes+ 5 Min</SelectItem><SelectItem size="sm" value="fifteen_minutes">- 15 Minutes+ 15 Min</SelectItem><SelectItem size="sm" value="hour">Hour@@ -65,7 +66,7 @@ const getOptions = (time: Time) => {return (<SelectContent><SelectItem size="sm" value="fifteen_minutes">- 15 Minutes+ 15 Min</SelectItem><SelectItem size="sm" value="hour">Hour@@ -114,16 +115,16 @@ const getOptions = (time: Time) => {<SelectContent>{timeRangeLength <= 7 && (<SelectItem size="sm" value="five_minutes">- 5 Minutes+ 5 Min</SelectItem>)}{timeRangeLength <= 14 && (<><SelectItem size="sm" value="ten_minutes">- 10 Minutes+ 10 Min</SelectItem><SelectItem size="sm" value="fifteen_minutes">- 15 Minutes+ 15 Min</SelectItem></>)}@@ -157,8 +158,11 @@ export function BucketSelection() {return (<Select value={bucket} onValueChange={setBucket}>- <SelectTrigger className="w-[100px]" size="sm">- <SelectValue />+ <SelectTrigger className="w-[90px]" size="sm">+ <div className="flex items-center gap-1">+ <TimerReset className="w-4 h-4" />+ <SelectValue />+ </div></SelectTrigger>{getOptions(time)}</Select>diff --git a/client/src/components/ui/dropdown-menu.tsx b/client/src/components/ui/dropdown-menu.tsxindex f7f84da4f..eeb0e34df 100644--- a/client/src/components/ui/dropdown-menu.tsx+++ b/client/src/components/ui/dropdown-menu.tsx@@ -94,7 +94,7 @@ const DropdownMenuItem = React.forwardRef<<DropdownMenuPrimitive.Itemref={ref}className={cn(- "relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-disabled:pointer-events-none data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 dark:focus:bg-neutral-800 dark:focus:text-neutral-50",+ "relative flex cursor-default select-none items-center gap-2 rounded-md px-2 py-1.5 text-sm outline-none transition-colors focus:bg-neutral-100 focus:text-neutral-900 data-disabled:pointer-events-none data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0 dark:focus:bg-neutral-800 dark:focus:text-neutral-50",inset && "pl-8",className)}diff --git a/client/src/components/ui/select.tsx b/client/src/components/ui/select.tsxindex 53dd1c5de..147385b85 100644--- a/client/src/components/ui/select.tsx+++ b/client/src/components/ui/select.tsx@@ -23,7 +23,7 @@ const SelectTrigger = React.forwardRef<className={cn("flex w-full items-center justify-between whitespace-nowrap rounded-md border border-neutral-150 bg-white px-3 text-sm ring-offset-white placeholder:text-neutral-500 focus:outline-none focus:ring-1 focus:ring-neutral-950 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 dark:border-neutral-750 dark:bg-neutral-900/70 dark:ring-offset-neutral-950 dark:placeholder:text-neutral-400 dark:focus:ring-neutral-300",size === "default" && "h-9 py-2",- size === "sm" && "h-7 py-1 text-xs",+ size === "sm" && "h-7 py-1 px-2 text-xs",className)}{...props}@@ -74,7 +74,7 @@ const SelectContent = React.forwardRef<<SelectPrimitive.Contentref={ref}className={cn(- "relative z-50 max-h-96 min-w-32 overflow-hidden rounded-md border border-neutral-150 bg-white text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",+ "relative z-50 max-h-96 overflow-hidden rounded-md border border-neutral-150 bg-white text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",position === "popper" &&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",size === "sm" && "text-xs",