Skip to content

Commit 339fc22

Browse files
committed
chore(data-picker): fix non alpha-numeric formatted year
1 parent 21f8468 commit 339fc22

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

packages/lumx-react/src/components/date-picker/DatePickerControlled.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ export const DatePickerControlled: Comp<DatePickerControlledProps, HTMLDivElemen
6161
return getMonthCalendar(localeObj, selectedMonth, minDate, maxDate);
6262
}, [locale, minDate, maxDate, selectedMonth]);
6363

64-
const selectedYear = selectedMonth.toLocaleDateString(locale, { year: 'numeric' }).slice(0, 4);
65-
const [currentYear, setCurrentYear] = React.useState(selectedYear);
64+
const selectedYear = selectedMonth.getFullYear();
65+
const formattedYear = selectedMonth.toLocaleDateString(locale, { year: 'numeric' }).slice(0, 4);
66+
const [currentYear, setCurrentYear] = React.useState(String(selectedYear));
6667

6768
// Updates month offset when validating year. Adds or removes 12 months per year when updating year value.
6869
const updateMonthOffset = React.useCallback(
@@ -110,7 +111,7 @@ export const DatePickerControlled: Comp<DatePickerControlledProps, HTMLDivElemen
110111

111112
// Update current year when selected year changes
112113
React.useEffect(() => {
113-
setCurrentYear(selectedYear);
114+
setCurrentYear(String(selectedYear));
114115
}, [selectedYear]);
115116

116117
const prevSelectedMonth = usePreviousValue(selectedMonth);
@@ -158,12 +159,12 @@ export const DatePickerControlled: Comp<DatePickerControlledProps, HTMLDivElemen
158159
vAlign="center"
159160
dir="auto"
160161
>
161-
{RegExp(`(.*)(${selectedYear})(.*)`)
162+
{RegExp(`(.*)(${formattedYear})(.*)`)
162163
.exec(monthYear)
163164
?.slice(1)
164165
.filter((part) => part !== '')
165166
.map((part) =>
166-
part === selectedYear ? (
167+
part === formattedYear ? (
167168
<TextField
168169
value={currentYear}
169170
aria-label={yearLabel}

0 commit comments

Comments
 (0)