Skip to content
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
43 changes: 30 additions & 13 deletions apps/web/ui/common/year-picker.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
"use client";

import { OptionPicker } from "@/ui/common/option-picker";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@coursemap/ui/primitives/select";

export type YearSelection = number | "all";

/**
* One academic year. This is a native-feeling select rather than the option
* picker: the values are a handful of four-digit years, and a searchable
* popover list drawn below the trigger read as a heavy component for choosing
* a single number. The select opens with the current year aligned over the
* trigger, so a change is one short movement. Newest first, because that is
* the year being worked on.
*/
export function YearPicker({
allLabel = "All",
allowAll = false,
Expand All @@ -22,21 +36,24 @@ export function YearPicker({
value: YearSelection;
years: number[];
}) {
const ordered = [...new Set(years)].sort((left, right) => left - right);
const ordered = [...new Set(years)].sort((left, right) => right - left);
return (
<OptionPicker
aria-label={ariaLabel}
<Select
disabled={disabled}
searchable={false}
value={String(value)}
items={[
...ordered.map((year) => ({
value: String(year),
label: String(year),
})),
...(allowAll ? [{ value: "all", label: allLabel }] : []),
]}
onValueChange={(next) => onChange(next === "all" ? "all" : Number(next))}
/>
>
<SelectTrigger aria-label={ariaLabel} size="sm" className="tabular-nums">
<SelectValue />
</SelectTrigger>
<SelectContent>
{ordered.map((year) => (
<SelectItem key={year} value={String(year)} className="tabular-nums">
{year}
</SelectItem>
))}
{allowAll ? <SelectItem value="all">{allLabel}</SelectItem> : null}
</SelectContent>
</Select>
);
}
215 changes: 215 additions & 0 deletions packages/ui/primitives/select.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
"use client"

import * as React from "react"
import { Select as SelectPrimitive } from "radix-ui"

import { cn } from "@coursemap/ui/lib/utils"
import { IconPlaceholder } from "@coursemap/ui/icon-placeholder"

function Select({
...props
}: React.ComponentProps<typeof SelectPrimitive.Root>) {
return <SelectPrimitive.Root data-slot="select" {...props} />
}

function SelectGroup({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.Group>) {
return (
<SelectPrimitive.Group
data-slot="select-group"
className={cn("cn-select-group", className)}
{...props}
/>
)
}

function SelectValue({
...props
}: React.ComponentProps<typeof SelectPrimitive.Value>) {
return <SelectPrimitive.Value data-slot="select-value" {...props} />
}

function SelectTrigger({
className,
size = "default",
children,
...props
}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
size?: "sm" | "default"
}) {
return (
<SelectPrimitive.Trigger
data-slot="select-trigger"
data-size={size}
className={cn(
"cn-select-trigger flex w-fit items-center justify-between whitespace-nowrap outline-none disabled:cursor-not-allowed disabled:opacity-50 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center [&_svg]:pointer-events-none [&_svg]:shrink-0",
className
)}
{...props}
>
{children}
<SelectPrimitive.Icon asChild>
<IconPlaceholder
lucide="ChevronDownIcon"
tabler="IconSelector"
hugeicons="UnfoldMoreIcon"
phosphor="CaretDownIcon"
remixicon="RiArrowDownSLine"
className="cn-select-trigger-icon pointer-events-none"
/>
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
)
}

function SelectContent({
className,
children,
position = "item-aligned",
align = "center",
...props
}: React.ComponentProps<typeof SelectPrimitive.Content>) {
return (
<SelectPrimitive.Portal>
<SelectPrimitive.Content
data-slot="select-content"
data-align-trigger={position === "item-aligned"}
className={cn(
"cn-select-content cn-menu-target cn-menu-translucent relative z-50 max-h-(--radix-select-content-available-height) origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto data-[align-trigger=true]:animate-none",
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",
className
)}
position={position}
align={align}
{...props}
>
<SelectScrollUpButton />
<SelectPrimitive.Viewport
data-position={position}
className={cn(
"cn-select-viewport data-[position=popper]:h-(--radix-select-trigger-height) data-[position=popper]:w-full data-[position=popper]:min-w-(--radix-select-trigger-width)",
position === "popper" && ""
)}
>
{children}
</SelectPrimitive.Viewport>
<SelectScrollDownButton />
</SelectPrimitive.Content>
</SelectPrimitive.Portal>
)
}

function SelectLabel({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.Label>) {
return (
<SelectPrimitive.Label
data-slot="select-label"
className={cn("cn-select-label", className)}
{...props}
/>
)
}

function SelectItem({
className,
children,
...props
}: React.ComponentProps<typeof SelectPrimitive.Item>) {
return (
<SelectPrimitive.Item
data-slot="select-item"
className={cn(
"cn-select-item relative flex w-full cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
className
)}
{...props}
>
<span className="cn-select-item-indicator">
<SelectPrimitive.ItemIndicator>
<IconPlaceholder
lucide="CheckIcon"
tabler="IconCheck"
hugeicons="Tick02Icon"
phosphor="CheckIcon"
remixicon="RiCheckLine"
className="cn-select-item-indicator-icon pointer-events-none"
/>
</SelectPrimitive.ItemIndicator>
</span>
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
)
}

function SelectSeparator({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
return (
<SelectPrimitive.Separator
data-slot="select-separator"
className={cn("cn-select-separator pointer-events-none", className)}
{...props}
/>
)
}

function SelectScrollUpButton({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
return (
<SelectPrimitive.ScrollUpButton
data-slot="select-scroll-up-button"
className={cn("cn-select-scroll-up-button", className)}
{...props}
>
<IconPlaceholder
lucide="ChevronUpIcon"
tabler="IconChevronUp"
hugeicons="ArrowUp01Icon"
phosphor="CaretUpIcon"
remixicon="RiArrowUpSLine"
/>
</SelectPrimitive.ScrollUpButton>
)
}

function SelectScrollDownButton({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
return (
<SelectPrimitive.ScrollDownButton
data-slot="select-scroll-down-button"
className={cn("cn-select-scroll-down-button", className)}
{...props}
>
<IconPlaceholder
lucide="ChevronDownIcon"
tabler="IconChevronDown"
hugeicons="ArrowDown01Icon"
phosphor="CaretDownIcon"
remixicon="RiArrowDownSLine"
/>
</SelectPrimitive.ScrollDownButton>
)
}

export {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectScrollDownButton,
SelectScrollUpButton,
SelectSeparator,
SelectTrigger,
SelectValue,
}
65 changes: 65 additions & 0 deletions packages/ui/style-nova.css
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,71 @@
@apply rounded-full;
}

/* MARK: Select */
.cn-select-trigger {
@apply border-input data-placeholder:text-muted-foreground dark:bg-input/30 dark:hover:bg-input/50 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:aria-invalid:border-destructive/50 gap-1.5 rounded-lg border bg-transparent py-2 pr-2 pl-2.5 text-sm transition-colors select-none focus-visible:ring-3 aria-invalid:ring-3 data-[size=default]:h-8 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] *:data-[slot=select-value]:flex *:data-[slot=select-value]:gap-1.5 [&_svg:not([class*='size-'])]:size-4;
}

.cn-select-value {
@apply flex flex-1 text-left;
}

.cn-select-value-aria {
@apply data-placeholder:text-muted-foreground;
}

.cn-select-trigger-icon {
@apply text-muted-foreground size-4;
}

.cn-select-content {
@apply bg-popover text-popover-foreground data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-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 ring-foreground/10 min-w-36 rounded-lg shadow-md ring-1 duration-100;
}

.cn-select-content-logical {
@apply data-[side=inline-start]:slide-in-from-right-2 data-[side=inline-end]:slide-in-from-left-2;
}

.cn-select-label {
@apply text-muted-foreground px-1.5 py-1 text-xs;
}

.cn-select-item {
@apply focus:bg-accent focus:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2;
}

.cn-select-item-aria {
@apply data-focused:bg-accent data-focused:text-accent-foreground;
}

.cn-select-item-indicator {
@apply pointer-events-none absolute right-2 flex size-4 items-center justify-center;
}

.cn-select-group {
@apply scroll-my-1 p-1;
}

.cn-select-item-text {
@apply flex flex-1 gap-2;
}

.cn-select-separator {
@apply bg-border -mx-1 my-1 h-px;
}

.cn-select-scroll-up-button {
@apply bg-popover z-10 flex cursor-default items-center justify-center py-1 [&_svg:not([class*='size-'])]:size-4;
}

.cn-select-scroll-down-button {
@apply bg-popover z-10 flex cursor-default items-center justify-center py-1 [&_svg:not([class*='size-'])]:size-4;
}

.cn-select-empty-aria {
@apply text-muted-foreground hidden w-full justify-center py-2 text-center text-sm group-data-empty/select-list:flex;
}

/* MARK: Sheet */
.cn-sheet-overlay {
@apply bg-black/10 supports-backdrop-filter:backdrop-blur-xs;
Expand Down
Loading