Skip to content

fix/hotfix-formfield #22

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
merged 6 commits into from
Jul 7, 2025
Merged

fix/hotfix-formfield #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1bcc808
feat: update shirt size options in form component
phongit-kha Jul 7, 2025
8e43814
feat: enhance province selection and update labels for clarity
phongit-kha Jul 7, 2025
abec5d6
fix: enforce minimum selection for current address district and reset…
phongit-kha Jul 7, 2025
f7aa178
fix: remove locale th to fix birthDate bug
phongit-kha Jul 7, 2025
6d1c91c
fix: change address latitude and longitude to optional and remove Goo…
phongit-kha Jul 7, 2025
53040af
style: pnpm format
phongit-kha Jul 7, 2025
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
1 change: 0 additions & 1 deletion src/components/register/1-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,6 @@ export default function FormComponent1({ studentData, departments }: Props) {
setSelectedBirthDate
}
translate="th"
locale={th}
/>
</PopoverContent>
</Popover>
Expand Down
124 changes: 50 additions & 74 deletions src/components/register/2-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,12 @@ const formSchema = z.object({
.max(16),
lineId: z.string().max(30).optional(),
facebook: z.string().max(60).optional(),
currentAddressLatitude: z.number(),
currentAddressLongitude: z.number(),
currentAddressLatitude: z.number().optional(),
currentAddressLongitude: z.number().optional(),
currentAddressProvinceId: z.number(),
currentAddressDistrictId: z.number(),
currentAddressDistrictId: z
.number()
.min(1, { message: "กรุณาเลือกเขต/อำเภอ" }),
currentAddressNumber: z.string().min(1).max(60),
currentAddressOther: z.string().min(1).max(400),
hometownAddressLongitude: z.number().optional(),
Expand Down Expand Up @@ -269,6 +271,17 @@ export default function FormComponent2({
router.push("/register/onboarding/3");
}

const sortedProvinces = useMemo(() => {
if (!provinces) return [];
const bkk = provinces.find((p) => p.nameTh === "กรุงเทพมหานคร");
const others = provinces
.filter((p) => p.nameTh !== "กรุงเทพมหานคร")
.sort((a, b) =>
(a.nameTh ?? "").localeCompare(b.nameTh ?? "", "th"),
);
return bkk ? [bkk, ...others] : others;
}, [provinces]);

return (
<Card className="p-6 md:p-8">
<Form {...form}>
Expand Down Expand Up @@ -518,28 +531,6 @@ export default function FormComponent2({
</section>

<section className="flex flex-col gap-2">
<div className="h-60 overflow-hidden rounded-lg border-[6px] border-white">
<GoogleMap
onLocationSelect={handleCurrentLocationSelect}
selectedLocation={
selectedCurrentLocationLat &&
selectedCurrentLocationLng
? {
lat: parseFloat(
selectedCurrentLocationLat,
),
lng: parseFloat(
selectedCurrentLocationLng,
),
}
: undefined
}
width="100%"
height="100%"
placeholder="ระบุตำแหน่งที่อยู่ปัจจุบัน"
/>
</div>

<FormField
control={form.control}
name="currentAddressLatitude"
Expand Down Expand Up @@ -582,22 +573,25 @@ export default function FormComponent2({
}
onValueChange={(value) => {
const selectedProvinceString =
provinces.find(
sortedProvinces.find(
(province) =>
province.nameTh ===
value,
);

if (!selectedProvinceString) {
return;
}

field.onChange(
selectedProvinceString.id,
);
setSelectedCurrentProvince(
selectedProvinceString.id,
);
// Reset district when province changes
form.setValue(
"currentAddressDistrictId",
0,
); // ใช้ 0 แทน undefined
}}
>
<FormControl>
Expand All @@ -606,7 +600,7 @@ export default function FormComponent2({
</SelectTrigger>
</FormControl>
<SelectContent>
{provinces.map((province) => (
{sortedProvinces.map((province) => (
<SelectItem
key={province.provinceCode}
value={
Expand All @@ -629,7 +623,7 @@ export default function FormComponent2({
render={({ field }) => (
<FormItem className="!pt-0">
<FormLabel>
เขตที่อยู่ปัจจุบัน
อำเภอ/เขตที่อยู่ปัจจุบัน
<span className="text-red-500">*</span>
</FormLabel>
<Select
Expand Down Expand Up @@ -725,7 +719,7 @@ export default function FormComponent2({
</FormLabel>
<FormControl>
<Input
placeholder="กรอกที่อยู่ปัจจุบัน"
placeholder="กรอกที่อยู่ปัจจุบัน (หมู่บ้าน/ซอย/ถนน/ตำบล)"
{...field}
/>
</FormControl>
Expand All @@ -737,28 +731,6 @@ export default function FormComponent2({

{selectedCountry === 221 ? ( // Thailand
<section className="flex flex-col gap-2">
<div className="h-60 overflow-hidden rounded-lg border-[6px] border-white">
<GoogleMap
onLocationSelect={handleHomeLocationSelect}
selectedLocation={
selectedHomeLocationLat &&
selectedHomeLocationLng
? {
lat: parseFloat(
selectedHomeLocationLat,
),
lng: parseFloat(
selectedHomeLocationLng,
),
}
: undefined
}
width="100%"
height="100%"
placeholder="ระบุตำแหน่งที่อยู่ภูมิลำเนา"
/>
</div>

<FormField
control={form.control}
name="hometownAddressLatitude"
Expand Down Expand Up @@ -786,7 +758,7 @@ export default function FormComponent2({
render={({ field }) => (
<FormItem className="!pt-0">
<FormLabel>
จังหวัดที่อยู่ภูมิลำเนา
จังหวัดที่อยู่ตามบัตรประชาชน
</FormLabel>
<Select
value={
Expand Down Expand Up @@ -820,24 +792,26 @@ export default function FormComponent2({
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder="เลือกจังหวัดที่อยู่ภูมิลำเนา" />
<SelectValue placeholder="เลือกจังหวัดที่อยู่ตามบัตรประชาชน" />
</SelectTrigger>
</FormControl>
<SelectContent>
{/* Map through provinces data */}
{provinces.map((province) => (
<SelectItem
key={
province.provinceCode
}
value={
province.nameTh ??
""
}
>
{province.nameTh}
</SelectItem>
))}
{sortedProvinces.map(
(province) => (
<SelectItem
key={
province.provinceCode
}
value={
province.nameTh ??
""
}
>
{province.nameTh}
</SelectItem>
),
)}
</SelectContent>
</Select>
<FormMessage />
Expand All @@ -851,7 +825,7 @@ export default function FormComponent2({
render={({ field }) => (
<FormItem className="!pt-0">
<FormLabel>
เขตที่อยู่ภูมิลำเนา
เขตที่อยู่ตามบัตรประชาชน
</FormLabel>
<Select
value={
Expand All @@ -877,7 +851,7 @@ export default function FormComponent2({
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder="เลือกเขตที่อยู่ภูมิลำเนา" />
<SelectValue placeholder="เลือกเขตที่อยู่ตามบัตรประชาชน" />
</SelectTrigger>
</FormControl>
<SelectContent>
Expand Down Expand Up @@ -936,10 +910,12 @@ export default function FormComponent2({
name="hometownAddressOther"
render={({ field }) => (
<FormItem>
<FormLabel>ที่อยู่ภูมิลำเนา</FormLabel>
<FormLabel>
ที่อยู่ตามบัตรประชาชน
</FormLabel>
<FormControl>
<Input
placeholder="กรอกที่อยู่ภูมิลำเนา"
placeholder="กรอกที่อยู่ตามบัตรประชาชน (หมู่บ้าน/ซอย/ถนน/ตำบล)"
{...field}
/>
</FormControl>
Expand All @@ -954,10 +930,10 @@ export default function FormComponent2({
name="hometownAddressOther"
render={({ field }) => (
<FormItem>
<FormLabel>ที่อยู่ภูมิลำเนา</FormLabel>
<FormLabel>ที่อยู่ตามบัตรประชาชน</FormLabel>
<FormControl>
<Input
placeholder="กรอกที่อยู่ภูมิลำเนา"
placeholder="กรอกที่อยู่ตามบัตรประชาชน"
{...field}
/>
</FormControl>
Expand Down
7 changes: 5 additions & 2 deletions src/components/register/3-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ export default function FormComponent3({ studentData }: Props) {
{ label: 'M (38")', value: 38 },
{ label: 'L (40")', value: 40 },
{ label: 'XL (42")', value: 42 },
{ label: 'XXL (44")', value: 44 },
{ label: 'XXXL (46")', value: 46 },
{ label: '2XL (44")', value: 44 },
{ label: '3XL (46")', value: 46 },
{ label: '4XL (48")', value: 48 },
{ label: '5XL (50")', value: 50 },
{ label: '6XL (52")', value: 52 },
];

return (
Expand Down