An open source design system that's fully customizable and agent ready
TypeScript
fix(DateRangeInput): reject commits after disabling open picker (#9155)
zakelstorm2936b07e8546
diff --git a/.changeset/ast-085-daterangeinput.md b/.changeset/ast-085-daterangeinput.mdnew file mode 100644index 0000000000..95162cd9ea--- /dev/null+++ b/.changeset/ast-085-daterangeinput.md@@ -0,0 +1,6 @@+---+'@astryxdesign/core': patch+---++[fix] DateRangeInput ignores calendar and preset commits after its open picker becomes disabled, without dismissing the picker or moving focus. Presets reflect the field's disabled state and reason. Enabled selection, clear behavior, and loading-only dismissal remain unchanged.+@korkt-kimdiff --git a/packages/core/src/DateRangeInput/DateRangeInput.test.tsx b/packages/core/src/DateRangeInput/DateRangeInput.test.tsxindex fb69fcdb45..09384886c7 100644--- a/packages/core/src/DateRangeInput/DateRangeInput.test.tsx+++ b/packages/core/src/DateRangeInput/DateRangeInput.test.tsx@@ -11,7 +11,7 @@import {useState} from 'react';import {describe, it, expect, vi, beforeEach, afterEach} from 'vitest';-import {render, screen, fireEvent, waitFor} from '@testing-library/react';+import {act, render, screen, fireEvent, waitFor} from '@testing-library/react';import userEvent from '@testing-library/user-event';function generateThemeTestCSS(theme: Parameters<typeof generateThemeCSS>[0]) {@@ -26,7 +26,7 @@ import {getButton, queryButton} from '../__tests__/fastRoleQueries';import * as stylex from '@stylexjs/stylex';import {colorVars} from '../theme/tokens.stylex';import {DateRangeInput} from './DateRangeInput';-import type {DateRange} from './DateRangeInput';+import type {DateRange, DateRangeInputProps} from './DateRangeInput';import {Icon} from '../Icon';import {defineTheme} from '../theme/defineTheme';import {generateThemeCSS} from '../theme/generateThemeRules';@@ -810,6 +810,103 @@ describe('DateRangeInput calendar while the popover is closed', () => {});});+describe('DateRangeInput disabled commit boundaries', () => {+ const props = {+ label: 'Range',+ value: {start: '2026-01-01', end: '2026-01-03'},+ onChange: vi.fn(),+ changeAction: vi.fn(),+ disabledMessage: 'Reporting is locked',+ presets: [+ {+ label: 'Last three days',+ getRange: () => ({start: '2026-01-08', end: '2026-01-10'}),+ },+ ],+ numberOfMonths: 1,+ min: '2026-01-01',+ max: '2026-01-31',+ } satisfies DateRangeInputProps;++ beforeEach(() => {+ props.onChange.mockClear();+ props.changeAction.mockClear();+ });++ it('blocks pointer and keyboard preset commits while disabled, preserving focus and reason', async () => {+ const user = userEvent.setup();+ const {rerender} = render(<DateRangeInput {...props} />);+ fireEvent.click(getButton('Open calendar'));+ const preset = getButton('Last three days');+ act(() => preset.focus());+ rerender(<DateRangeInput {...props} isDisabled />);+ fireEvent.click(preset);+ await user.keyboard('{Enter} ');++ expect(props.onChange).not.toHaveBeenCalled();+ expect(props.changeAction).not.toHaveBeenCalled();+ expect(preset).toHaveFocus();+ expect(preset).not.toHaveAttribute('disabled');+ expect(preset).toHaveAttribute('aria-disabled', 'true');+ expect(preset).toHaveAttribute('data-disabled');+ expect(preset).toHaveAccessibleDescription('Reporting is locked');+ expect(getButton(/^Range:/)).toHaveTextContent(/Jan.*1.*Jan.*3/);+ expect(getButton(/^Range:/)).toHaveAttribute('aria-expanded', 'true');+ });++ it('blocks range commits after disabling an open picker without closing or moving focus', async () => {+ const user = userEvent.setup();+ const {rerender} = render(<DateRangeInput {...props} />);+ await user.click(getButton('Open calendar'));+ await waitFor(() => expect(getButton('Last three days')).toHaveFocus());+ fireEvent.click(getButton(/January 15, 2026/));+ expect(props.onChange).not.toHaveBeenCalled();+ const end = getButton(/January 16, 2026/);+ act(() => end.focus());++ rerender(<DateRangeInput {...props} isDisabled />);+ fireEvent.click(end);+ await user.keyboard('{Enter} ');++ expect(props.onChange).not.toHaveBeenCalled();+ expect(props.changeAction).not.toHaveBeenCalled();+ expect(end).toHaveFocus();+ expect(getButton(/^Range:/)).toHaveTextContent(/Jan.*1.*Jan.*3/);+ expect(getButton(/^Range:/)).toHaveAttribute('aria-expanded', 'true');++ rerender(<DateRangeInput {...props} />);+ await user.click(getButton(/January 15, 2026/));+ await user.click(end);+ const range = {start: '2026-01-15', end: '2026-01-16'};+ expect(props.onChange).toHaveBeenCalledExactlyOnceWith(range);+ expect(props.changeAction).toHaveBeenCalledExactlyOnceWith(range);+ expect(getButton(/^Range:/)).toHaveAttribute('aria-expanded', 'false');+ });++ it('preserves loading-only selection dismissal without committing a range', () => {+ const {rerender} = render(<DateRangeInput {...props} />);+ fireEvent.click(getButton('Open calendar'));+ rerender(<DateRangeInput {...props} isLoading />);+ const preset = getButton('Last three days');+ expect(preset).not.toHaveAttribute('aria-disabled');+ expect(preset).not.toHaveAttribute('data-disabled');+ expect(preset).not.toHaveAttribute('aria-describedby');+ fireEvent.click(preset);+ expect(getButton(/^Range:/)).toHaveAttribute('aria-expanded', 'false');++ rerender(<DateRangeInput {...props} />);+ fireEvent.click(getButton('Open calendar'));+ fireEvent.click(getButton(/January 15, 2026/));+ rerender(<DateRangeInput {...props} isLoading />);+ fireEvent.click(getButton(/January 16, 2026/));++ expect(props.onChange).not.toHaveBeenCalled();+ expect(props.changeAction).not.toHaveBeenCalled();+ expect(getButton(/^Range:/)).toHaveTextContent(/Jan.*1.*Jan.*3/);+ expect(getButton(/^Range:/)).toHaveAttribute('aria-expanded', 'false');+ });+});+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.tsxindex 4b802d96b9..b1d1c69841 100644--- a/packages/core/src/DateRangeInput/DateRangeInput.tsx+++ b/packages/core/src/DateRangeInput/DateRangeInput.tsx@@ -613,7 +613,7 @@ export function DateRangeInput({const fireChange = useCallback((newValue: DateRange | null) => {- if (isBusy) {+ if (isEffectivelyDisabled) {return;}onChange(newValue);@@ -624,7 +624,13 @@ export function DateRangeInput({});}},- [isBusy, onChange, changeAction, startTransition, setOptimisticValue],+ [+ isEffectivelyDisabled,+ onChange,+ changeAction,+ startTransition,+ setOptimisticValue,+ ],);const handleToggle = useCallback(() => {@@ -639,10 +645,13 @@ export function DateRangeInput({const handleRangeSelect = useCallback((range: DateRange) => {+ if (isDisabled) {+ return;+ }fireChange(range);popover.hide();},- [fireChange, popover],+ [isDisabled, fireChange, popover],);const triggerRef = useRef<HTMLButtonElement>(null);@@ -813,6 +822,7 @@ export function DateRangeInput({const presetRange = preset.getRange();const isActive = isRangeEqual(value, presetRange);const isPresetDisabled =+ isDisabled ||!isRangeWithinSpan(presetRange, maxRangeSpan, minRangeSpan) ||isDateDisabled(plainDateFromISO(presetRange.start)) ||isDateDisabled(plainDateFromISO(presetRange.end));@@ -828,6 +838,11 @@ export function DateRangeInput({aria-current={isActive ? 'true' : undefined}// Focusable while disabled (AR3, spec:AST-085 FR1).aria-disabled={isPresetDisabled || undefined}+ aria-describedby={+ showsDisabledMessage+ ? disabledMessageTooltip.describedBy+ : undefined+ }onClick={() => {if (!isPresetDisabled) {handleRangeSelect(presetRange);