Skip to content

An open source design system that's fully customizable and agent ready

TypeScript

fix(DateInput, DateRangeInput, DateTimeInput): mount the calendar only while the popover is open (#8902)

Harjoth Kharad799afea8684
diff --git a/.changeset/date-input-calendar-mounts-when-open.md b/.changeset/date-input-calendar-mounts-when-open.md
new file mode 100644
index 0000000000..bfa2989e40
--- /dev/null
+++ b/.changeset/date-input-calendar-mounts-when-open.md
@@ -0,0 +1,7 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] DateInput, DateRangeInput and DateTimeInput no longer build their calendar while the popover is closed. Each closed field used to mount a full month grid at page load and keep it updated, so a form with many date fields paid that cost per field. The calendar now mounts when the popover opens and opens on the field's current value. Opening, focus and dismissal are unchanged.
+
+@harjothkhara
diff --git a/packages/core/src/DateInput/DateInput.test.tsx b/packages/core/src/DateInput/DateInput.test.tsx
index e3d7e371c4..cb2f7e6627 100644
--- a/packages/core/src/DateInput/DateInput.test.tsx
+++ b/packages/core/src/DateInput/DateInput.test.tsx
@@ -633,15 +633,19 @@ describe('DateInput', () => {
}
render(<ControlledDateInput />);
- await user.click(getButton('Open calendar'));
+ const toggle = getButton('Open calendar');
+ await user.click(toggle);
await user.click(getButton(/January 15, 2026/));
+ // The calendar mounts only while open; reopen it to read the selection.
+ await user.click(toggle);
expect(
screen.getAllByRole('gridcell', {selected: true, hidden: true}),
).toHaveLength(1);
+ await user.click(toggle);
await user.click(getButton('Clear Date'));
expect(screen.getByRole('combobox')).toHaveValue('');
- await user.click(getButton('Open calendar'));
+ await user.click(toggle);
expect(
screen.queryAllByRole('gridcell', {selected: true, hidden: true}),
@@ -1152,6 +1156,53 @@ describe('DateInput', () => {
expect(screen.getByDisplayValue('Mar 10, 2026')).toBeInTheDocument();
});
});
+ describe('calendar while the popover is closed', () => {
+ const calendarGrid = () => document.querySelector('[role="grid"]');
+
+ it('renders no calendar until the popover opens, and none after it closes', () => {
+ render(<DateInput label="Date" value="2026-01-25" onChange={() => {}} />);
+ const toggle = getButton('Open calendar');
+ expect(calendarGrid()).toBeNull();
+
+ fireEvent.click(toggle);
+ expect(calendarGrid()).not.toBeNull();
+
+ fireEvent.click(toggle);
+ expect(calendarGrid()).toBeNull();
+ });
+
+ it('opens on the month of a date typed while closed', () => {
+ function Controlled() {
+ const [value, setValue] = useState<ISODateString | undefined>(
+ '2026-01-25',
+ );
+ return <DateInput label="Date" value={value} onChange={setValue} />;
+ }
+ render(<Controlled />);
+ const input = screen.getByRole('combobox');
+
+ fireEvent.change(input, {target: {value: 'March 5, 2027'}});
+ fireEvent.keyDown(input, {key: 'ArrowDown'});
+
+ expect(calendarGrid()).toHaveAccessibleName('March 2027');
+ });
+
+ it('moves focus into the calendar on each open from the toggle', async () => {
+ render(<DateInput label="Date" value="2026-01-25" onChange={() => {}} />);
+ const toggle = getButton('Open calendar');
+
+ for (let i = 0; i < 2; i++) {
+ fireEvent.click(toggle);
+ // The first calendar control takes focus, not the dialog surface.
+ await waitFor(() => {
+ expect(getButton('Previous month')).toHaveFocus();
+ });
+ fireEvent.click(toggle);
+ expect(calendarGrid()).toBeNull();
+ }
+ });
+ });
+
describe('weekStartsOn', () => {
// The calendar popover renders in the top layer; jsdom keeps the content in
// the DOM but role queries skip it, so read the columnheaders directly.
diff --git a/packages/core/src/DateInput/DateInput.tsx b/packages/core/src/DateInput/DateInput.tsx
index e924f478c6..1ce9e2107d 100644
--- a/packages/core/src/DateInput/DateInput.tsx
+++ b/packages/core/src/DateInput/DateInput.tsx
@@ -948,17 +948,21 @@ function PointerDateField({
{isBusy && <Spinner size="sm" aria-hidden="true" />}
{statusIcon}
{popover.render(
- <Calendar
- handleRef={calendarRef}
- mode="single"
- value={optimisticValue ?? null}
- onChange={handleDateSelect}
- min={min}
- max={max}
- dateConstraints={dateConstraints}
- numberOfMonths={numberOfMonths}
- weekStartsOn={weekStartsOn}
- />,
+ // The layer renders its children open or closed, so mount the
+ // calendar only while it is open; it opens on the current value.
+ !popover.isOpen ? null : (
+ <Calendar
+ handleRef={calendarRef}
+ mode="single"
+ value={optimisticValue ?? null}
+ onChange={handleDateSelect}
+ min={min}
+ max={max}
+ dateConstraints={dateConstraints}
+ numberOfMonths={numberOfMonths}
+ weekStartsOn={weekStartsOn}
+ />
+ ),
{placement: 'below', alignment: 'start'},
)}
{showsDisabledMessage &&
diff --git a/packages/core/src/DateRangeInput/DateRangeInput.test.tsx b/packages/core/src/DateRangeInput/DateRangeInput.test.tsx
index 99923de12f..fb69fcdb45 100644
--- a/packages/core/src/DateRangeInput/DateRangeInput.test.tsx
+++ b/packages/core/src/DateRangeInput/DateRangeInput.test.tsx
@@ -18,9 +18,9 @@ function generateThemeTestCSS(theme: Parameters<typeof generateThemeCSS>[0]) {
const {prose, component} = generateThemeCSS(theme);
return [prose, component].filter(Boolean).join('\n\n');
}
-// getButton/queryButton instead of getByRole('button', {name}): the closed
-// popover keeps a two-month Calendar (~85 role=button nodes) mounted, which
-// made every role+name query compute ~85 accessible names through jsdom's
+// getButton/queryButton instead of getByRole('button', {name}): the open
+// popover holds a two-month Calendar (~85 role=button nodes), which makes
+// every role+name query compute ~85 accessible names through jsdom's
// slow getComputedStyle (~450ms per query). See fastRoleQueries.ts.
import {getButton, queryButton} from '../__tests__/fastRoleQueries';
import * as stylex from '@stylexjs/stylex';
@@ -767,6 +767,49 @@ describe('DateRangeInput', () => {
});
});
+describe('DateRangeInput calendar while the popover is closed', () => {
+ const calendarGrid = () => document.querySelector('[role="grid"]');
+
+ it('renders no calendar until the popover opens, and none after it closes', () => {
+ render(
+ <DateRangeInput
+ label="Range"
+ value={{start: '2026-01-05', end: '2026-01-09'}}
+ onChange={() => {}}
+ />,
+ );
+ const toggle = getButton('Open calendar');
+ expect(calendarGrid()).toBeNull();
+
+ fireEvent.click(toggle);
+ expect(calendarGrid()).not.toBeNull();
+
+ fireEvent.click(toggle);
+ expect(calendarGrid()).toBeNull();
+ });
+
+ it('moves focus into the popover on each open from the toggle', async () => {
+ render(
+ <DateRangeInput
+ label="Range"
+ value={{start: '2026-01-05', end: '2026-01-09'}}
+ onChange={() => {}}
+ />,
+ );
+ const toggle = getButton('Open calendar');
+
+ for (let i = 0; i < 2; i++) {
+ fireEvent.click(toggle);
+ // The first calendar control takes focus, not the dialog surface.
+ await waitFor(() => {
+ expect(getButton('Previous month')).toHaveFocus();
+ });
+ fireEvent.click(toggle);
+ expect(calendarGrid()).toBeNull();
+ }
+ });
+});
+
describe('DateRangeInput statusVariant forwarding', () => {
it('defaults to attached (status renders with data-variant="attached")', () => {
const {container} = render(
diff --git a/packages/core/src/DateRangeInput/DateRangeInput.tsx b/packages/core/src/DateRangeInput/DateRangeInput.tsx
index ee3bac7e41..4b802d96b9 100644
--- a/packages/core/src/DateRangeInput/DateRangeInput.tsx
+++ b/packages/core/src/DateRangeInput/DateRangeInput.tsx
@@ -851,18 +851,22 @@ export function DateRangeInput({
})}
</div>
)}
- <Calendar
- mode="range"
- value={optimisticValue}
- onChange={handleRangeSelect}
- min={min}
- max={max}
- dateConstraints={dateConstraints}
- maxRangeSpan={maxRangeSpan}
- minRangeSpan={minRangeSpan}
- numberOfMonths={numberOfMonths}
- weekStartsOn={weekStartsOn}
- />
+ {/* The layer renders its children open or closed, so mount the
+ calendar only while it is open. */}
+ {popover.isOpen && (
+ <Calendar
+ mode="range"
+ value={optimisticValue}
+ onChange={handleRangeSelect}
+ min={min}
+ max={max}
+ dateConstraints={dateConstraints}
+ maxRangeSpan={maxRangeSpan}
+ minRangeSpan={minRangeSpan}
+ numberOfMonths={numberOfMonths}
+ weekStartsOn={weekStartsOn}
+ />
+ )}
</div>,
{placement: 'below', alignment: 'start'},
)}
diff --git a/packages/core/src/DateTimeInput/DateTimeInput.test.tsx b/packages/core/src/DateTimeInput/DateTimeInput.test.tsx
index ef8a70b154..497b452de3 100644
--- a/packages/core/src/DateTimeInput/DateTimeInput.test.tsx
+++ b/packages/core/src/DateTimeInput/DateTimeInput.test.tsx
@@ -2293,6 +2293,67 @@ describe('DateTimeInput', () => {
});
});
+ describe('calendar while the popover is closed', () => {
+ const calendarGrid = () => document.querySelector('[role="grid"]');
+
+ it('renders no calendar until the popover opens, and none after it closes', () => {
+ render(
+ <DateTimeInput
+ label="Meeting"
+ value={'2026-01-15T10:00' as ISODateTimeString}
+ onChange={() => {}}
+ />,
+ );
+ const toggle = getButton('Open calendar');
+ expect(calendarGrid()).toBeNull();
+
+ fireEvent.click(toggle);
+ expect(calendarGrid()).not.toBeNull();
+
+ fireEvent.click(toggle);
+ expect(calendarGrid()).toBeNull();
+ });
+
+ it('opens on the month of a date typed while closed', () => {
+ function Controlled() {
+ const [value, setValue] = useState<ISODateTimeString | undefined>(
+ '2026-01-15T10:00' as ISODateTimeString,
+ );
+ return (
+ <DateTimeInput label="Meeting" value={value} onChange={setValue} />
+ );
+ }
+ render(<Controlled />);
+ const dateInput = screen.getAllByRole('combobox')[0];
+
+ fireEvent.change(dateInput, {target: {value: 'March 5, 2027'}});
+ fireEvent.keyDown(dateInput, {key: 'ArrowDown'});
+
+ expect(calendarGrid()).toHaveAccessibleName('March 2027');
+ });
+
+ it('moves focus into the calendar on each open from the toggle', async () => {
+ render(
+ <DateTimeInput
+ label="Meeting"
+ value={'2026-01-15T10:00' as ISODateTimeString}
+ onChange={() => {}}
+ />,
+ );
+ const toggle = getButton('Open calendar');
+
+ for (let i = 0; i < 2; i++) {
+ fireEvent.click(toggle);
+ // The first calendar control takes focus, not the dialog surface.
+ await waitFor(() => {
+ expect(getButton('Previous month')).toHaveFocus();
+ });
+ fireEvent.click(toggle);
+ expect(calendarGrid()).toBeNull();
+ }
+ });
+ });
+
describe('weekStartsOn', () => {
// The calendar popover renders in the top layer; jsdom keeps the content in
// the DOM but role queries skip it, so read the columnheaders directly.
diff --git a/packages/core/src/DateTimeInput/DateTimeInput.tsx b/packages/core/src/DateTimeInput/DateTimeInput.tsx
index a5b5bc294b..679073d714 100644
--- a/packages/core/src/DateTimeInput/DateTimeInput.tsx
+++ b/packages/core/src/DateTimeInput/DateTimeInput.tsx
@@ -1937,17 +1937,21 @@ function PointerDateTimeField({
{!usesNativePicker &&
popover.render(
- <Calendar
- handleRef={calendarRef}
- mode="single"
- value={valueParts.date ?? null}
- onChange={(d: ISODateString) => handleDateChange(d, 'calendar')}
- min={calendarMin}
- max={calendarMax}
- dateConstraints={dateConstraints}
- numberOfMonths={numberOfMonths}
- weekStartsOn={weekStartsOn}
- />,
+ // Mounted only while open, like the time list below; the calendar
+ // opens on the current value.
+ !popover.isOpen ? null : (
+ <Calendar
+ handleRef={calendarRef}
+ mode="single"
+ value={valueParts.date ?? null}
+ onChange={(d: ISODateString) => handleDateChange(d, 'calendar')}
+ min={calendarMin}
+ max={calendarMax}
+ dateConstraints={dateConstraints}
+ numberOfMonths={numberOfMonths}
+ weekStartsOn={weekStartsOn}
+ />
+ ),
{placement: 'below', alignment: 'start'},
)}