feat(i18n): country/phone/timezone/subdivision primitives + form wiring
Cross-cutting i18n polish for forms across the marina + residential + company
domains. Introduces a single source of truth for country/phone/timezone/
subdivision data and replaces every nationality-as-free-text and timezone-
as-string Input with a dedicated combobox.
PR1 Countries — ALL_COUNTRY_CODES (~250 ISO-3166-1 alpha-2), Intl.DisplayNames
for localized labels, detectDefaultCountry() with navigator-region
fallback to US, CountryCombobox with regional-indicator flag glyphs +
compact mode for inline use.
PR2 Phone — libphonenumber-js wrapper (parsePhone / formatAsYouType /
callingCodeFor), PhoneInput with flag dropdown + national-format
AsYouType + paste-detect that flips the country dropdown for pasted
international strings.
PR3 Timezones — country->IANA map (250 entries, multi-zone for AU/BR/CA/CD/
ID/KZ/MN/MX/RU/US), formatTimezoneLabel ("Europe/London (UTC+1)"),
TimezoneCombobox with Suggested/All grouping driven by countryHint.
PR4 Subdivisions — wraps the iso-3166-2 npm package (~5000 ISO 3166-2
codes for every country), per-country cache, SubdivisionCombobox with
"Pick a country first" / "No regions available" empty states.
PR5 Schema deltas (migration 0015) — clients.nationality_iso, clientContacts
{value_e164, value_country}, clientAddresses {country_iso, subdivision_iso},
residentialClients {phone_e164, phone_country, nationality_iso, timezone,
place_of_residence_country_iso, subdivision_iso}, companies {incorporation_
country_iso, incorporation_subdivision_iso}, companyAddresses {country_iso,
subdivision_iso}. Plus shared zod validators (validators/i18n.ts) used
by every entity validator + route handler.
PR6 ClientForm + ClientDetail — CountryCombobox replaces nationality Input,
TimezoneCombobox replaces timezone Input (driven by nationalityIso hint),
PhoneInput conditionally rendered for phone/whatsapp contacts. Inline
editors (InlineCountryField / InlineTimezoneField / InlinePhoneField)
for the detail-page overview rows + ContactsEditor.
PR7 Residential client form + detail — phone -> PhoneInput, nationality/
timezone/place-of-residence-country/subdivision rows in both create
sheet and inline-editable detail view. Subdivision wipes when country
flips since codes are country-scoped.
PR8 Company form + detail — incorporation country -> CountryCombobox,
incorporation region -> SubdivisionCombobox in both modes.
PR9 Public inquiry endpoint — accepts pre-normalized phoneE164/phoneCountry
and i18n fields from newer website builds, server-side parsePhone()
fallback for legacy raw-international submissions. Old Nuxt builds
keep working unchanged.
Tests: 4 unit suites for the primitives (25 tests), 1 integration spec for
the public phone-normalization path (3 tests), 1 smoke spec asserting the
combobox triggers render in all three create sheets.
Test totals: vitest 713 -> 741 (+28).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Matt Ciaccio
153
src/components/shared/country-combobox.tsx
Normal file
153
src/components/shared/country-combobox.tsx
Normal file
@@ -0,0 +1,153 @@
|
||||
'use client';
|
||||
|
||||
import { useMemo, useState } from 'react';
|
||||
import { Check, ChevronsUpDown } from 'lucide-react';
|
||||
|
||||
import { Button } from '@/components/ui/button';
|
||||
import {
|
||||
Command,
|
||||
CommandEmpty,
|
||||
CommandGroup,
|
||||
CommandInput,
|
||||
CommandItem,
|
||||
CommandList,
|
||||
} from '@/components/ui/command';
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { ALL_COUNTRY_CODES, getCountryName, type CountryCode } from '@/lib/i18n/countries';
|
||||
|
||||
interface CountryComboboxProps {
|
||||
value: string | null | undefined;
|
||||
onChange: (iso: CountryCode | null) => void;
|
||||
/** Display locale; defaults to navigator.language so country names follow the user. */
|
||||
locale?: string;
|
||||
/** When true, renders just the flag/code (compact 24×24 trigger). */
|
||||
compact?: boolean;
|
||||
placeholder?: string;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
/** Allow clearing the selection. */
|
||||
clearable?: boolean;
|
||||
id?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the regional-indicator emoji flag for an ISO alpha-2 code.
|
||||
* E.g. 'GB' → 🇬🇧. Avoids shipping a flag-image asset and respects the
|
||||
* platform's emoji rendering (iOS/macOS render real flags; Windows
|
||||
* shows the country code on a flag rectangle).
|
||||
*/
|
||||
function flagEmoji(code: string): string {
|
||||
if (code.length !== 2) return '';
|
||||
const A = 0x1f1e6;
|
||||
const a = 'A'.charCodeAt(0);
|
||||
const cp1 = A + code.charCodeAt(0) - a;
|
||||
const cp2 = A + code.charCodeAt(1) - a;
|
||||
return String.fromCodePoint(cp1, cp2);
|
||||
}
|
||||
|
||||
export function CountryCombobox({
|
||||
value,
|
||||
onChange,
|
||||
locale,
|
||||
compact = false,
|
||||
placeholder = 'Select country…',
|
||||
disabled,
|
||||
className,
|
||||
clearable = true,
|
||||
id,
|
||||
'data-testid': testId,
|
||||
}: CountryComboboxProps) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const effectiveLocale = locale ?? (typeof navigator !== 'undefined' ? navigator.language : 'en');
|
||||
|
||||
// Pre-build the options list once per locale change so the cmdk filter
|
||||
// can search by both code + localized name without re-allocating.
|
||||
const options = useMemo(() => {
|
||||
return ALL_COUNTRY_CODES.map((code) => ({
|
||||
code,
|
||||
name: getCountryName(code, effectiveLocale),
|
||||
flag: flagEmoji(code),
|
||||
})).sort((a, b) => a.name.localeCompare(b.name, effectiveLocale));
|
||||
}, [effectiveLocale]);
|
||||
|
||||
const selected = value ? options.find((o) => o.code === value) : undefined;
|
||||
|
||||
return (
|
||||
<Popover open={open} onOpenChange={setOpen}>
|
||||
<PopoverTrigger asChild>
|
||||
<Button
|
||||
id={id}
|
||||
variant="outline"
|
||||
role="combobox"
|
||||
aria-expanded={open}
|
||||
disabled={disabled}
|
||||
className={cn(
|
||||
'justify-between',
|
||||
compact ? 'w-20 px-2' : 'w-full',
|
||||
!selected && 'text-muted-foreground',
|
||||
className,
|
||||
)}
|
||||
data-testid={testId}
|
||||
>
|
||||
{selected ? (
|
||||
<span className="flex min-w-0 items-center gap-2">
|
||||
<span className="text-base leading-none">{selected.flag}</span>
|
||||
{!compact ? (
|
||||
<span className="truncate text-sm">{selected.name}</span>
|
||||
) : (
|
||||
<span className="text-xs font-medium">{selected.code}</span>
|
||||
)}
|
||||
</span>
|
||||
) : (
|
||||
<span className="truncate">{placeholder}</span>
|
||||
)}
|
||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className="w-[280px] p-0" align="start">
|
||||
<Command>
|
||||
<CommandInput placeholder="Search country or code…" />
|
||||
<CommandList>
|
||||
<CommandEmpty>No country found.</CommandEmpty>
|
||||
{clearable && value ? (
|
||||
<CommandGroup>
|
||||
<CommandItem
|
||||
value="__clear__"
|
||||
onSelect={() => {
|
||||
onChange(null);
|
||||
setOpen(false);
|
||||
}}
|
||||
className="text-muted-foreground"
|
||||
>
|
||||
Clear selection
|
||||
</CommandItem>
|
||||
</CommandGroup>
|
||||
) : null}
|
||||
<CommandGroup>
|
||||
{options.map((opt) => (
|
||||
<CommandItem
|
||||
key={opt.code}
|
||||
// cmdk filters by `value` — include both code + name.
|
||||
value={`${opt.name} ${opt.code}`}
|
||||
onSelect={() => {
|
||||
onChange(opt.code);
|
||||
setOpen(false);
|
||||
}}
|
||||
>
|
||||
<Check
|
||||
className={cn('mr-2 h-4 w-4', value === opt.code ? 'opacity-100' : 'opacity-0')}
|
||||
/>
|
||||
<span className="mr-2 text-base leading-none">{opt.flag}</span>
|
||||
<span className="flex-1 truncate text-sm">{opt.name}</span>
|
||||
<span className="text-xs text-muted-foreground">{opt.code}</span>
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandGroup>
|
||||
</CommandList>
|
||||
</Command>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
92
src/components/shared/inline-country-field.tsx
Normal file
92
src/components/shared/inline-country-field.tsx
Normal file
@@ -0,0 +1,92 @@
|
||||
'use client';
|
||||
|
||||
import { useState } from 'react';
|
||||
import { Loader2, Pencil } from 'lucide-react';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
import { CountryCombobox } from '@/components/shared/country-combobox';
|
||||
import { getCountryName, type CountryCode } from '@/lib/i18n/countries';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
interface InlineCountryFieldProps {
|
||||
value: string | null | undefined;
|
||||
onSave: (next: CountryCode | null) => Promise<void>;
|
||||
emptyText?: string;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Click-to-edit country picker. Renders the localized country name with a
|
||||
* regional-indicator flag glyph; opens a CountryCombobox on click.
|
||||
*/
|
||||
export function InlineCountryField({
|
||||
value,
|
||||
onSave,
|
||||
emptyText = '—',
|
||||
disabled,
|
||||
className,
|
||||
'data-testid': testId,
|
||||
}: InlineCountryFieldProps) {
|
||||
const [editing, setEditing] = useState(false);
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
async function commit(next: CountryCode | null) {
|
||||
if (next === (value ?? null)) {
|
||||
setEditing(false);
|
||||
return;
|
||||
}
|
||||
setSaving(true);
|
||||
try {
|
||||
await onSave(next);
|
||||
setEditing(false);
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : 'Failed to save');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (editing) {
|
||||
return (
|
||||
<div className={cn('flex items-center gap-1', className)}>
|
||||
<CountryCombobox value={value} onChange={(iso) => void commit(iso)} data-testid={testId} />
|
||||
{saving && <Loader2 className="h-3 w-3 animate-spin text-muted-foreground" />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const display = value
|
||||
? `${flagEmoji(value)} ${getCountryName(value, typeof navigator !== 'undefined' ? navigator.language : 'en')}`
|
||||
: null;
|
||||
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
disabled={disabled}
|
||||
onClick={() => setEditing(true)}
|
||||
data-testid={testId}
|
||||
className={cn(
|
||||
'group inline-flex items-center gap-1.5 rounded px-1 -mx-1 py-0.5 text-left text-sm',
|
||||
'hover:bg-muted/60 focus-visible:bg-muted/60 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring',
|
||||
disabled && 'cursor-not-allowed opacity-60 hover:bg-transparent',
|
||||
className,
|
||||
)}
|
||||
>
|
||||
<span className={cn('flex-1', !display && 'text-muted-foreground')}>
|
||||
{display ?? emptyText}
|
||||
</span>
|
||||
{!disabled && (
|
||||
<Pencil className="h-3 w-3 opacity-0 transition-opacity group-hover:opacity-50" />
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
function flagEmoji(code: string): string {
|
||||
if (code.length !== 2) return '';
|
||||
const A = 0x1f1e6;
|
||||
const a = 'A'.charCodeAt(0);
|
||||
return String.fromCodePoint(A + code.charCodeAt(0) - a, A + code.charCodeAt(1) - a);
|
||||
}
|
||||
130
src/components/shared/inline-phone-field.tsx
Normal file
130
src/components/shared/inline-phone-field.tsx
Normal file
@@ -0,0 +1,130 @@
|
||||
'use client';
|
||||
|
||||
import { useState } from 'react';
|
||||
import { Loader2, Pencil } from 'lucide-react';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
import { PhoneInput, type PhoneInputValue } from '@/components/shared/phone-input';
|
||||
import { parsePhone } from '@/lib/i18n/phone';
|
||||
import type { CountryCode } from '@/lib/i18n/countries';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
interface InlinePhoneFieldProps {
|
||||
/** E.164 form ('+442079460958'), null when unset. */
|
||||
e164: string | null | undefined;
|
||||
/** ISO-3166-1 alpha-2 the number was parsed against. */
|
||||
country: string | null | undefined;
|
||||
/** Falls back to this country if `country` isn't set. */
|
||||
defaultCountry?: CountryCode;
|
||||
onSave: (next: { e164: string | null; country: CountryCode }) => Promise<void>;
|
||||
emptyText?: string;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
export function InlinePhoneField({
|
||||
e164,
|
||||
country,
|
||||
defaultCountry,
|
||||
onSave,
|
||||
emptyText = '—',
|
||||
disabled,
|
||||
className,
|
||||
'data-testid': testId,
|
||||
}: InlinePhoneFieldProps) {
|
||||
const [editing, setEditing] = useState(false);
|
||||
const [draft, setDraft] = useState<PhoneInputValue | null>(() => {
|
||||
if (!e164 && !country) return null;
|
||||
return {
|
||||
e164: e164 ?? null,
|
||||
country: (country as CountryCode | null) ?? defaultCountry ?? 'US',
|
||||
};
|
||||
});
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
async function commit() {
|
||||
const next = draft ?? { e164: null, country: defaultCountry ?? 'US' };
|
||||
if (next.e164 === (e164 ?? null) && next.country === (country ?? null)) {
|
||||
setEditing(false);
|
||||
return;
|
||||
}
|
||||
setSaving(true);
|
||||
try {
|
||||
await onSave(next);
|
||||
setEditing(false);
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : 'Failed to save');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (editing) {
|
||||
return (
|
||||
<div className={cn('flex items-center gap-1', className)}>
|
||||
<PhoneInput
|
||||
value={draft}
|
||||
onChange={(v) => setDraft(v)}
|
||||
defaultCountry={defaultCountry}
|
||||
data-testid={testId}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => void commit()}
|
||||
disabled={saving}
|
||||
className="rounded px-2 py-1 text-xs font-medium hover:bg-muted disabled:opacity-50"
|
||||
>
|
||||
{saving ? <Loader2 className="h-3 w-3 animate-spin" /> : 'Save'}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setDraft(
|
||||
e164 || country
|
||||
? {
|
||||
e164: e164 ?? null,
|
||||
country: (country as CountryCode | null) ?? defaultCountry ?? 'US',
|
||||
}
|
||||
: null,
|
||||
);
|
||||
setEditing(false);
|
||||
}}
|
||||
disabled={saving}
|
||||
className="rounded px-2 py-1 text-xs text-muted-foreground hover:bg-muted disabled:opacity-50"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Display: prefer the parsed national format (more readable than raw E.164).
|
||||
let display: string | null = null;
|
||||
if (e164) {
|
||||
const parsed = parsePhone(e164, (country as CountryCode | undefined) ?? defaultCountry);
|
||||
display = parsed.national ?? e164;
|
||||
}
|
||||
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
disabled={disabled}
|
||||
onClick={() => setEditing(true)}
|
||||
data-testid={testId}
|
||||
className={cn(
|
||||
'group inline-flex items-center gap-1.5 rounded px-1 -mx-1 py-0.5 text-left text-sm',
|
||||
'hover:bg-muted/60 focus-visible:bg-muted/60 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring',
|
||||
disabled && 'cursor-not-allowed opacity-60 hover:bg-transparent',
|
||||
className,
|
||||
)}
|
||||
>
|
||||
<span className={cn('flex-1', !display && 'text-muted-foreground')}>
|
||||
{display ?? emptyText}
|
||||
</span>
|
||||
{!disabled && (
|
||||
<Pencil className="h-3 w-3 opacity-0 transition-opacity group-hover:opacity-50" />
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
88
src/components/shared/inline-timezone-field.tsx
Normal file
88
src/components/shared/inline-timezone-field.tsx
Normal file
@@ -0,0 +1,88 @@
|
||||
'use client';
|
||||
|
||||
import { useState } from 'react';
|
||||
import { Loader2, Pencil } from 'lucide-react';
|
||||
import { toast } from 'sonner';
|
||||
|
||||
import { TimezoneCombobox } from '@/components/shared/timezone-combobox';
|
||||
import { formatTimezoneLabel } from '@/lib/i18n/timezones';
|
||||
import type { CountryCode } from '@/lib/i18n/countries';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
interface InlineTimezoneFieldProps {
|
||||
value: string | null | undefined;
|
||||
onSave: (next: string | null) => Promise<void>;
|
||||
/** Optional country to surface "Suggested" zones in the picker. */
|
||||
countryHint?: CountryCode | null;
|
||||
emptyText?: string;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
export function InlineTimezoneField({
|
||||
value,
|
||||
onSave,
|
||||
countryHint,
|
||||
emptyText = '—',
|
||||
disabled,
|
||||
className,
|
||||
'data-testid': testId,
|
||||
}: InlineTimezoneFieldProps) {
|
||||
const [editing, setEditing] = useState(false);
|
||||
const [saving, setSaving] = useState(false);
|
||||
|
||||
async function commit(next: string | null) {
|
||||
if (next === (value ?? null)) {
|
||||
setEditing(false);
|
||||
return;
|
||||
}
|
||||
setSaving(true);
|
||||
try {
|
||||
await onSave(next);
|
||||
setEditing(false);
|
||||
} catch (err) {
|
||||
toast.error(err instanceof Error ? err.message : 'Failed to save');
|
||||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
}
|
||||
|
||||
if (editing) {
|
||||
return (
|
||||
<div className={cn('flex items-center gap-1', className)}>
|
||||
<TimezoneCombobox
|
||||
value={value}
|
||||
onChange={(tz) => void commit(tz)}
|
||||
countryHint={countryHint ?? undefined}
|
||||
data-testid={testId}
|
||||
/>
|
||||
{saving && <Loader2 className="h-3 w-3 animate-spin text-muted-foreground" />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const display = value ? formatTimezoneLabel(value) : null;
|
||||
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
disabled={disabled}
|
||||
onClick={() => setEditing(true)}
|
||||
data-testid={testId}
|
||||
className={cn(
|
||||
'group inline-flex items-center gap-1.5 rounded px-1 -mx-1 py-0.5 text-left text-sm',
|
||||
'hover:bg-muted/60 focus-visible:bg-muted/60 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring',
|
||||
disabled && 'cursor-not-allowed opacity-60 hover:bg-transparent',
|
||||
className,
|
||||
)}
|
||||
>
|
||||
<span className={cn('flex-1', !display && 'text-muted-foreground')}>
|
||||
{display ?? emptyText}
|
||||
</span>
|
||||
{!disabled && (
|
||||
<Pencil className="h-3 w-3 opacity-0 transition-opacity group-hover:opacity-50" />
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
144
src/components/shared/phone-input.tsx
Normal file
144
src/components/shared/phone-input.tsx
Normal file
@@ -0,0 +1,144 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { CountryCombobox } from '@/components/shared/country-combobox';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { callingCodeFor, formatAsYouType, parsePhone } from '@/lib/i18n/phone';
|
||||
import { detectDefaultCountry, type CountryCode } from '@/lib/i18n/countries';
|
||||
|
||||
export interface PhoneInputValue {
|
||||
/** E.164 form ('+442079460958'). Null when empty or unparseable. */
|
||||
e164: string | null;
|
||||
/** Country selected in the dropdown — drives the AsYouType formatter. */
|
||||
country: CountryCode;
|
||||
}
|
||||
|
||||
interface PhoneInputProps {
|
||||
value: PhoneInputValue | null | undefined;
|
||||
onChange: (next: PhoneInputValue) => void;
|
||||
/** Pre-selects the dropdown when `value.country` isn't supplied. */
|
||||
defaultCountry?: CountryCode;
|
||||
placeholder?: string;
|
||||
disabled?: boolean;
|
||||
required?: boolean;
|
||||
invalid?: boolean;
|
||||
id?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Phone input with a country flag dropdown + format-as-you-type.
|
||||
*
|
||||
* Wire shape: emits `{ e164, country }` on every change. E.164 is null
|
||||
* while the input is too short to parse — that's a form-validation
|
||||
* concern, not an input concern. Pasting an international number
|
||||
* (`+1 415…`) auto-switches the country dropdown to match.
|
||||
*
|
||||
* Implementation notes:
|
||||
* - The visible string is always the AsYouType national-format,
|
||||
* so users see e.g. "020 7946 0958" while typing GB digits.
|
||||
* - The `country` prop drives the AsYouType context; flipping
|
||||
* countries reformats the same digits against the new country
|
||||
* (matches what users expect when they fix a wrong country pick).
|
||||
*/
|
||||
export function PhoneInput({
|
||||
value,
|
||||
onChange,
|
||||
defaultCountry,
|
||||
placeholder = 'Phone number',
|
||||
disabled,
|
||||
required,
|
||||
invalid,
|
||||
id,
|
||||
'data-testid': testId,
|
||||
}: PhoneInputProps) {
|
||||
const [country, setCountry] = useState<CountryCode>(
|
||||
() => value?.country ?? defaultCountry ?? detectDefaultCountry('US'),
|
||||
);
|
||||
const [display, setDisplay] = useState(() => {
|
||||
if (!value?.e164) return '';
|
||||
const parsed = parsePhone(value.e164, value.country);
|
||||
return parsed.national ?? '';
|
||||
});
|
||||
// Track whether the user has typed since mount — keeps a controlled-from-props
|
||||
// value sync on first render only.
|
||||
const initialized = useRef(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (initialized.current) return;
|
||||
initialized.current = true;
|
||||
}, []);
|
||||
|
||||
function emit(rawDigits: string, currentCountry: CountryCode) {
|
||||
const parsed = parsePhone(rawDigits, currentCountry);
|
||||
onChange({ e164: parsed.e164, country: currentCountry });
|
||||
}
|
||||
|
||||
function handleInput(raw: string) {
|
||||
// Paste-detect: if user pasted an international format, parse it
|
||||
// and flip the country dropdown to match — better UX than asking
|
||||
// them to also click the dropdown.
|
||||
if (raw.startsWith('+')) {
|
||||
const parsed = parsePhone(raw);
|
||||
if (parsed.country) {
|
||||
setCountry(parsed.country);
|
||||
const reformatted = formatAsYouType(raw, parsed.country);
|
||||
setDisplay(reformatted);
|
||||
emit(raw, parsed.country);
|
||||
return;
|
||||
}
|
||||
}
|
||||
const formatted = formatAsYouType(raw, country);
|
||||
setDisplay(formatted);
|
||||
emit(formatted, country);
|
||||
}
|
||||
|
||||
function handleCountryChange(next: CountryCode | null) {
|
||||
if (!next) return;
|
||||
setCountry(next);
|
||||
// Re-run the formatter against the new country so the visible
|
||||
// string stays consistent with the dropdown.
|
||||
const reformatted = formatAsYouType(display, next);
|
||||
setDisplay(reformatted);
|
||||
emit(reformatted, next);
|
||||
}
|
||||
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
'flex items-stretch gap-1.5',
|
||||
invalid && '[&_input]:border-destructive [&_button[role=combobox]]:border-destructive',
|
||||
)}
|
||||
>
|
||||
<CountryCombobox
|
||||
value={country}
|
||||
onChange={handleCountryChange}
|
||||
compact
|
||||
clearable={false}
|
||||
disabled={disabled}
|
||||
data-testid={testId ? `${testId}-country` : undefined}
|
||||
/>
|
||||
<div className="flex flex-1 items-stretch overflow-hidden rounded-md border border-input focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2 focus-within:ring-offset-background">
|
||||
<span className="flex select-none items-center bg-muted/40 px-2 text-sm tabular-nums text-muted-foreground">
|
||||
{callingCodeFor(country)}
|
||||
</span>
|
||||
<Input
|
||||
id={id}
|
||||
type="tel"
|
||||
inputMode="tel"
|
||||
autoComplete="tel"
|
||||
placeholder={placeholder}
|
||||
value={display}
|
||||
disabled={disabled}
|
||||
required={required}
|
||||
onChange={(e) => handleInput(e.target.value)}
|
||||
// Strip the inner Input's own border so it sits flush with the country prefix.
|
||||
className="flex-1 border-0 shadow-none focus-visible:ring-0 focus-visible:ring-offset-0"
|
||||
data-testid={testId}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
124
src/components/shared/subdivision-combobox.tsx
Normal file
124
src/components/shared/subdivision-combobox.tsx
Normal file
@@ -0,0 +1,124 @@
|
||||
'use client';
|
||||
|
||||
import { useMemo, useState } from 'react';
|
||||
import { Check, ChevronsUpDown } from 'lucide-react';
|
||||
|
||||
import { Button } from '@/components/ui/button';
|
||||
import {
|
||||
Command,
|
||||
CommandEmpty,
|
||||
CommandGroup,
|
||||
CommandInput,
|
||||
CommandItem,
|
||||
CommandList,
|
||||
} from '@/components/ui/command';
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { subdivisionsForCountry } from '@/lib/i18n/subdivisions';
|
||||
import type { CountryCode } from '@/lib/i18n/countries';
|
||||
|
||||
interface SubdivisionComboboxProps {
|
||||
value: string | null | undefined;
|
||||
onChange: (code: string | null) => void;
|
||||
/**
|
||||
* Country whose subdivisions populate the dropdown. When the country
|
||||
* has no recognized subdivisions, the trigger renders disabled with
|
||||
* an empty-state hint so the form still lays out.
|
||||
*/
|
||||
country: CountryCode | null | undefined;
|
||||
placeholder?: string;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
clearable?: boolean;
|
||||
id?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
export function SubdivisionCombobox({
|
||||
value,
|
||||
onChange,
|
||||
country,
|
||||
placeholder = 'Select region…',
|
||||
disabled,
|
||||
className,
|
||||
clearable = true,
|
||||
id,
|
||||
'data-testid': testId,
|
||||
}: SubdivisionComboboxProps) {
|
||||
const [open, setOpen] = useState(false);
|
||||
|
||||
const options = useMemo(() => {
|
||||
if (!country) return [];
|
||||
return subdivisionsForCountry(country);
|
||||
}, [country]);
|
||||
|
||||
const selected = value ? options.find((o) => o.code === value) : undefined;
|
||||
const noCountry = !country;
|
||||
const noSubdivisions = !noCountry && options.length === 0;
|
||||
const isDisabled = disabled || noCountry || noSubdivisions;
|
||||
|
||||
let triggerLabel: string;
|
||||
if (selected) triggerLabel = selected.name;
|
||||
else if (noCountry) triggerLabel = 'Pick a country first';
|
||||
else if (noSubdivisions) triggerLabel = 'No regions available';
|
||||
else triggerLabel = placeholder;
|
||||
|
||||
return (
|
||||
<Popover open={open} onOpenChange={setOpen}>
|
||||
<PopoverTrigger asChild>
|
||||
<Button
|
||||
id={id}
|
||||
variant="outline"
|
||||
role="combobox"
|
||||
aria-expanded={open}
|
||||
disabled={isDisabled}
|
||||
className={cn('w-full justify-between', !selected && 'text-muted-foreground', className)}
|
||||
data-testid={testId}
|
||||
>
|
||||
<span className="truncate text-sm">{triggerLabel}</span>
|
||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className="w-[320px] p-0" align="start">
|
||||
<Command>
|
||||
<CommandInput placeholder={`Search ${country ?? 'regions'}…`} />
|
||||
<CommandList>
|
||||
<CommandEmpty>No region found.</CommandEmpty>
|
||||
{clearable && value ? (
|
||||
<CommandGroup>
|
||||
<CommandItem
|
||||
value="__clear__"
|
||||
onSelect={() => {
|
||||
onChange(null);
|
||||
setOpen(false);
|
||||
}}
|
||||
className="text-muted-foreground"
|
||||
>
|
||||
Clear selection
|
||||
</CommandItem>
|
||||
</CommandGroup>
|
||||
) : null}
|
||||
<CommandGroup>
|
||||
{options.map((opt) => (
|
||||
<CommandItem
|
||||
key={opt.code}
|
||||
value={`${opt.name} ${opt.code}`}
|
||||
onSelect={() => {
|
||||
onChange(opt.code);
|
||||
setOpen(false);
|
||||
}}
|
||||
>
|
||||
<Check
|
||||
className={cn('mr-2 h-4 w-4', value === opt.code ? 'opacity-100' : 'opacity-0')}
|
||||
/>
|
||||
<span className="flex-1 truncate text-sm">{opt.name}</span>
|
||||
<span className="text-xs text-muted-foreground">{opt.code}</span>
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandGroup>
|
||||
</CommandList>
|
||||
</Command>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
150
src/components/shared/timezone-combobox.tsx
Normal file
150
src/components/shared/timezone-combobox.tsx
Normal file
@@ -0,0 +1,150 @@
|
||||
'use client';
|
||||
|
||||
import { useMemo, useState } from 'react';
|
||||
import { Check, ChevronsUpDown } from 'lucide-react';
|
||||
|
||||
import { Button } from '@/components/ui/button';
|
||||
import {
|
||||
Command,
|
||||
CommandEmpty,
|
||||
CommandGroup,
|
||||
CommandInput,
|
||||
CommandItem,
|
||||
CommandList,
|
||||
CommandSeparator,
|
||||
} from '@/components/ui/command';
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { formatTimezoneLabel, listAllTimezones, timezonesForCountry } from '@/lib/i18n/timezones';
|
||||
import type { CountryCode } from '@/lib/i18n/countries';
|
||||
|
||||
interface TimezoneComboboxProps {
|
||||
value: string | null | undefined;
|
||||
onChange: (iana: string | null) => void;
|
||||
/** When set, the dropdown surfaces matching zones first under a "Suggested" group. */
|
||||
countryHint?: CountryCode;
|
||||
placeholder?: string;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
clearable?: boolean;
|
||||
id?: string;
|
||||
'data-testid'?: string;
|
||||
}
|
||||
|
||||
export function TimezoneCombobox({
|
||||
value,
|
||||
onChange,
|
||||
countryHint,
|
||||
placeholder = 'Select timezone…',
|
||||
disabled,
|
||||
className,
|
||||
clearable = true,
|
||||
id,
|
||||
'data-testid': testId,
|
||||
}: TimezoneComboboxProps) {
|
||||
const [open, setOpen] = useState(false);
|
||||
|
||||
const allOptions = useMemo(() => {
|
||||
return listAllTimezones().map((tz) => ({
|
||||
tz,
|
||||
label: formatTimezoneLabel(tz),
|
||||
}));
|
||||
}, []);
|
||||
|
||||
const suggested = useMemo(() => {
|
||||
if (!countryHint) return [];
|
||||
const set = new Set(timezonesForCountry(countryHint));
|
||||
return allOptions.filter((o) => set.has(o.tz));
|
||||
}, [allOptions, countryHint]);
|
||||
|
||||
const rest = useMemo(() => {
|
||||
if (!suggested.length) return allOptions;
|
||||
const suggestedSet = new Set(suggested.map((s) => s.tz));
|
||||
return allOptions.filter((o) => !suggestedSet.has(o.tz));
|
||||
}, [allOptions, suggested]);
|
||||
|
||||
const selectedLabel = value ? formatTimezoneLabel(value) : placeholder;
|
||||
|
||||
return (
|
||||
<Popover open={open} onOpenChange={setOpen}>
|
||||
<PopoverTrigger asChild>
|
||||
<Button
|
||||
id={id}
|
||||
variant="outline"
|
||||
role="combobox"
|
||||
aria-expanded={open}
|
||||
disabled={disabled}
|
||||
className={cn('w-full justify-between', !value && 'text-muted-foreground', className)}
|
||||
data-testid={testId}
|
||||
>
|
||||
<span className="truncate text-sm">{selectedLabel}</span>
|
||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className="w-[360px] p-0" align="start">
|
||||
<Command>
|
||||
<CommandInput placeholder="Search timezones…" />
|
||||
<CommandList>
|
||||
<CommandEmpty>No timezone found.</CommandEmpty>
|
||||
{clearable && value ? (
|
||||
<CommandGroup>
|
||||
<CommandItem
|
||||
value="__clear__"
|
||||
onSelect={() => {
|
||||
onChange(null);
|
||||
setOpen(false);
|
||||
}}
|
||||
className="text-muted-foreground"
|
||||
>
|
||||
Clear selection
|
||||
</CommandItem>
|
||||
</CommandGroup>
|
||||
) : null}
|
||||
{suggested.length > 0 ? (
|
||||
<>
|
||||
<CommandGroup heading="Suggested">
|
||||
{suggested.map((opt) => (
|
||||
<CommandItem
|
||||
key={opt.tz}
|
||||
value={opt.tz}
|
||||
onSelect={() => {
|
||||
onChange(opt.tz);
|
||||
setOpen(false);
|
||||
}}
|
||||
>
|
||||
<Check
|
||||
className={cn(
|
||||
'mr-2 h-4 w-4',
|
||||
value === opt.tz ? 'opacity-100' : 'opacity-0',
|
||||
)}
|
||||
/>
|
||||
<span className="truncate text-sm">{opt.label}</span>
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandGroup>
|
||||
<CommandSeparator />
|
||||
</>
|
||||
) : null}
|
||||
<CommandGroup heading={suggested.length > 0 ? 'All zones' : undefined}>
|
||||
{rest.map((opt) => (
|
||||
<CommandItem
|
||||
key={opt.tz}
|
||||
value={opt.tz}
|
||||
onSelect={() => {
|
||||
onChange(opt.tz);
|
||||
setOpen(false);
|
||||
}}
|
||||
>
|
||||
<Check
|
||||
className={cn('mr-2 h-4 w-4', value === opt.tz ? 'opacity-100' : 'opacity-0')}
|
||||
/>
|
||||
<span className="truncate text-sm">{opt.label}</span>
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandGroup>
|
||||
</CommandList>
|
||||
</Command>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user