Skip to content

Polish the rail and inspector with shadcn controls #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ankitsejwal merged 3 commits into from
Jun 28, 2026
Merged

Polish the rail and inspector with shadcn controls #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cdf446
Add shadcn Select/Switch/Slider/Tooltip primitives
ankitsejwal Jun 28, 2026
9467965
Right rail: shadcn Select dropdowns and Switch toggles
ankitsejwal Jun 28, 2026
61d18e1
Inspector: shadcn Slider for zoom, tooltips on icons
ankitsejwal Jun 28, 2026
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
2 changes: 2 additions & 0 deletions apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
"lucide-react": "^1.21.0",
"offline-geocode-city": "^1.0.2",
"pdf-lib": "^1.17.1",
"radix-ui": "^1.6.0",
"react": "^19.2.7",
"react-dom": "^19.2.7",
"tailwind-merge": "^3.6.0",
"tw-animate-css": "^1.4.0",
"zustand": "^5.0.14"
},
"devDependencies": {
Expand Down
35 changes: 22 additions & 13 deletions apps/web/src/components/a4-preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import {

import { SheetInspector } from '@/components/sheet-inspector'
import { SheetPage } from '@/components/sheet-page'
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from '@/components/ui/tooltip'
import { type Orientation } from '@/lib/crop'
import { captionFontStack } from '@/lib/fonts'
import { FRAME_SHAPES, paperSize } from '@/lib/layout'
Expand Down Expand Up @@ -112,19 +117,23 @@ function PageShapeToggle({
const Icon = SHAPE_ICONS[id]
const active = value === id
return (
<button
key={id}
type="button"
aria-label={`${label} frames on this page`}
aria-pressed={active}
onClick={() => onChange(id)}
className={cn(
'flex size-6 items-center justify-center rounded text-neutral-400 hover:bg-neutral-100 hover:text-neutral-700',
active && 'bg-neutral-200 text-neutral-900',
)}
>
<Icon className="size-3.5" />
</button>
<Tooltip key={id}>
<TooltipTrigger asChild>
<button
type="button"
aria-label={`${label} frames on this page`}
aria-pressed={active}
onClick={() => onChange(id)}
className={cn(
'text-muted-foreground hover:bg-accent hover:text-foreground flex size-6 items-center justify-center rounded',
active && 'bg-accent text-foreground',
)}
>
<Icon className="size-3.5" />
</button>
</TooltipTrigger>
<TooltipContent>{label} frames on this page</TooltipContent>
</Tooltip>
)
})}
</div>
Expand Down
154 changes: 84 additions & 70 deletions apps/web/src/components/options-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ import { type ReactNode, useState } from 'react'
import { Minus, Plus } from 'lucide-react'

import { Button } from '@/components/ui/button'
import { Label } from '@/components/ui/label'
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select'
import { Switch } from '@/components/ui/switch'
import { type Orientation } from '@/lib/crop'
import { DATE_FORMATS, type DateFormat } from '@/lib/date'
import { CAPTION_FONTS } from '@/lib/fonts'
Expand All @@ -24,9 +33,6 @@ import {
useSettingsStore,
} from '@/stores/settings-store'

const SELECT_CLASS =
'border-input bg-background rounded-md border px-2 py-1 text-sm'

/** The right-hand rail: every caption + sheet option, plus export. */
export function OptionsPanel() {
const photos = usePhotoStore((state) => state.photos)
Expand Down Expand Up @@ -101,82 +107,77 @@ export function OptionsPanel() {
<div className="border-input bg-card flex flex-col gap-5 rounded-lg border p-3">
<Section title="Captions">
<Field label="Location" htmlFor="opt-location">
<select
<FieldSelect
id="opt-location"
className={SELECT_CLASS}
value={captionLocation}
onChange={(event) =>
selectLocation(event.target.value as CaptionLocation)
}
onChange={(value) => selectLocation(value as CaptionLocation)}
>
{LOCATION_DETAILS.map((detail) => (
<option key={detail.id} value={detail.id}>
<SelectItem key={detail.id} value={detail.id}>
{detail.label}
</option>
</SelectItem>
))}
<option value="neighborhood" disabled>
<SelectItem value="neighborhood" disabled>
Neighborhood (offline N/A)
</option>
</select>
</SelectItem>
</FieldSelect>
</Field>
<Field label="Date" htmlFor="opt-date">
<select
<FieldSelect
id="opt-date"
className={SELECT_CLASS}
value={dateFormat}
onChange={(event) => selectDate(event.target.value as DateFormat)}
onChange={(value) => selectDate(value as DateFormat)}
>
{DATE_FORMATS.map((format) => (
<option key={format.id} value={format.id}>
<SelectItem key={format.id} value={format.id}>
{format.label}
</option>
</SelectItem>
))}
</select>
</FieldSelect>
</Field>
<Field label="Font" htmlFor="opt-font">
<select
id="opt-font"
className={SELECT_CLASS}
value={captionFontId}
onChange={(event) => setCaptionFont(event.target.value)}
>
<FieldSelect id="opt-font" value={captionFontId} onChange={setCaptionFont}>
{CAPTION_FONTS.map((font) => (
<option key={font.id} value={font.id} style={{ fontFamily: font.stack }}>
<SelectItem
key={font.id}
value={font.id}
style={{ fontFamily: font.stack }}
>
{font.label}
</option>
</SelectItem>
))}
</select>
</FieldSelect>
</Field>
<Toggle
<SettingSwitch
label="Camera info"
checked={showCameraLine}
onChange={setShowCameraLine}
/>
<Toggle label="Captions" checked={showCaptions} onChange={setShowCaptions} />
<SettingSwitch
label="Captions"
checked={showCaptions}
onChange={setShowCaptions}
/>
</Section>

<Section title="Sheet">
<Field label="Frame" htmlFor="opt-shape">
<select
<FieldSelect
id="opt-shape"
className={SELECT_CLASS}
value={uniformShape ?? 'mixed'}
onChange={(event) => {
if (event.target.value !== 'mixed')
setFrameShapeAll(event.target.value as Orientation)
}}
onChange={(value) => setFrameShapeAll(value as Orientation)}
>
{!uniformShape && (
<option value="mixed" disabled>
<SelectItem value="mixed" disabled>
Mixed
</option>
</SelectItem>
)}
{FRAME_SHAPES.map((option) => (
<option key={option.id} value={option.id}>
<SelectItem key={option.id} value={option.id}>
{option.label}
</option>
</SelectItem>
))}
</select>
</FieldSelect>
</Field>
<Field label="Border" htmlFor="opt-border">
<span className="flex items-center gap-1">
Expand Down Expand Up @@ -214,32 +215,26 @@ export function OptionsPanel() {
</span>
</Field>
<Field label="Thickness" htmlFor="opt-thickness">
<select
<FieldSelect
id="opt-thickness"
className={SELECT_CLASS}
value={borderWidth}
onChange={(event) => setBorderWidth(Number(event.target.value))}
value={String(borderWidth)}
onChange={(value) => setBorderWidth(Number(value))}
>
{BORDER_WIDTHS.map((option) => (
<option key={option.label} value={option.ratio}>
<SelectItem key={option.label} value={String(option.ratio)}>
{option.label}
</option>
</SelectItem>
))}
</select>
</FieldSelect>
</Field>
<Field label="Paper" htmlFor="opt-paper">
<select
id="opt-paper"
className={SELECT_CLASS}
value={paperSizeId}
onChange={(event) => setPaperSize(event.target.value)}
>
<FieldSelect id="opt-paper" value={paperSizeId} onChange={setPaperSize}>
{PAPER_SIZES.map((size) => (
<option key={size.id} value={size.id}>
<SelectItem key={size.id} value={size.id}>
{size.label}
</option>
</SelectItem>
))}
</select>
</FieldSelect>
</Field>
<Field label="Per row" htmlFor="opt-perrow">
<Stepper
Expand All @@ -249,7 +244,7 @@ export function OptionsPanel() {
onChange={setPerRow}
/>
</Field>
<Toggle
<SettingSwitch
label="Cut marks"
checked={showCutMarks}
onChange={setShowCutMarks}
Expand All @@ -267,6 +262,27 @@ export function OptionsPanel() {
)
}

function FieldSelect({
id,
value,
onChange,
children,
}: {
id: string
value: string
onChange: (value: string) => void
children: ReactNode
}) {
return (
<Select value={value} onValueChange={onChange}>
<SelectTrigger id={id} size="sm" className="w-[150px]">
<SelectValue />
</SelectTrigger>
<SelectContent>{children}</SelectContent>
</Select>
)
}

function Stepper({
value,
min,
Expand Down Expand Up @@ -329,15 +345,15 @@ function Field({
}) {
return (
<div className="flex items-center justify-between gap-2">
<label htmlFor={htmlFor} className="text-sm">
<Label htmlFor={htmlFor} className="text-sm font-normal">
{label}
</label>
</Label>
{children}
</div>
)
}

function Toggle({
function SettingSwitch({
label,
checked,
onChange,
Expand All @@ -346,15 +362,13 @@ function Toggle({
checked: boolean
onChange: (value: boolean) => void
}) {
const id = `opt-${label.toLowerCase().replace(/\s+/g, '-')}`
return (
<label className="flex items-center gap-2 text-sm">
<input
type="checkbox"
checked={checked}
onChange={(event) => onChange(event.target.checked)}
className="accent-primary"
/>
{label}
</label>
<div className="flex items-center justify-between gap-2">
<Label htmlFor={id} className="text-sm font-normal">
{label}
</Label>
<Switch id={id} checked={checked} onCheckedChange={onChange} />
</div>
)
}
Loading
Loading