Resolve merge conflicts with upstream - keep GitHub versions

frontend/src/components/birth-date-picker.tsx

@@ -1,10 +1,9 @@
 "use client";
 
 import { format } from "date-fns";
-import { zhCN as dateFnsZhCN } from "date-fns/locale";
+import { zhCN } from "date-fns/locale";
 import { CalendarIcon } from "lucide-react";
 import { useId, useState } from "react";
-import { zhCN } from "react-day-picker/locale";
 
 import { Button } from "@/components/ui/button";
 import { Calendar } from "@/components/ui/calendar";
@@ -17,8 +16,6 @@ type BirthDatePickerProps = {
   readonly onChange: (value: string) => void;
 };
 
-const emptyDefaultMonth = new Date(1997, 0, 1);
-
 export function BirthDatePicker({ value, disabled, onChange }: BirthDatePickerProps) {
   const labelId = useId();
   const valueId = useId();
@@ -26,6 +23,7 @@ export function BirthDatePicker({ value, disabled, onChange }: BirthDatePickerPr
   const selected = parseBirthDate(value);
   const today = new Date();
   today.setHours(0, 0, 0, 0);
+  const defaultMonth = new Date(1997, today.getMonth(), 1);
 
   return (
     <div className="grid gap-2">
@@ -45,18 +43,19 @@ export function BirthDatePicker({ value, disabled, onChange }: BirthDatePickerPr
           <span id={valueId}>
             {selected === undefined
               ? "选择出生日期"
-              : format(selected, "PPP", { locale: dateFnsZhCN })}
+              : format(selected, "PPP", { locale: zhCN })}
           </span>
         </PopoverTrigger>
-        <PopoverContent align="start" className="w-auto p-0" aria-label="选择出生日期">
+        <PopoverContent align="start" className="w-auto p-0">
           <Calendar
             key={value || "empty"}
             mode="single"
             className="[--cell-size:2.75rem] [&_button[data-selected-single=true]]:text-primary-foreground!"
             locale={zhCN}
             selected={selected}
-            defaultMonth={selected ?? emptyDefaultMonth}
+            defaultMonth={selected ?? defaultMonth}
             captionLayout="dropdown"
+            navLayout="after"
             startMonth={new Date(1900, 0)}
             endMonth={today}
             reverseYears

frontend/src/components/ui/calendar.tsx

@@ -51,17 +51,17 @@ function Calendar({
         ),
         month: cn("flex w-full flex-col gap-4", defaultClassNames.month),
         nav: cn(
-          "absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1",
+          "pointer-events-none absolute inset-x-0 top-0 flex w-full items-center justify-between gap-1",
           defaultClassNames.nav
         ),
         button_previous: cn(
           buttonVariants({ variant: buttonVariant }),
-          "size-(--cell-size) p-0 select-none aria-disabled:opacity-50",
+          "pointer-events-auto size-(--cell-size) p-0 select-none aria-disabled:opacity-50",
           defaultClassNames.button_previous
         ),
         button_next: cn(
           buttonVariants({ variant: buttonVariant }),
-          "size-(--cell-size) p-0 select-none aria-disabled:opacity-50",
+          "pointer-events-auto size-(--cell-size) p-0 select-none aria-disabled:opacity-50",
           defaultClassNames.button_next
         ),
         month_caption: cn(