Skip to content

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

TypeScript

Hardening: Form Inputs (#2276)

Andrey Goder3e957919d229
diff --git a/apps/storybook/stories/DateRangePicker.stories.tsx b/apps/storybook/stories/DateRangeInput.stories.tsx
similarity index 79%
rename from apps/storybook/stories/DateRangePicker.stories.tsx
rename to apps/storybook/stories/DateRangeInput.stories.tsx
index 282ac0ba50..ea707f752c 100644
--- a/apps/storybook/stories/DateRangePicker.stories.tsx
+++ b/apps/storybook/stories/DateRangeInput.stories.tsx
@@ -2,8 +2,8 @@
import {useState} from 'react';
import type {Meta, StoryObj} from '@storybook/react';
-import {XDSDateRangePicker} from '@xds/core/DateRangePicker';
-import type {XDSDateRange} from '@xds/core/DateRangePicker';
+import {XDSDateRangeInput} from '@xds/core/DateRangeInput';
+import type {XDSDateRange} from '@xds/core/DateRangeInput';
import type {ISODateString} from '@xds/core/Calendar';
function daysAgo(n: number): ISODateString {
@@ -40,9 +40,9 @@ const defaultPresets = [
},
];
-const meta: Meta<typeof XDSDateRangePicker> = {
- title: 'Core/Inputs/DateRangePicker',
- component: XDSDateRangePicker,
+const meta: Meta<typeof XDSDateRangeInput> = {
+ title: 'Core/Inputs/DateRangeInput',
+ component: XDSDateRangeInput,
tags: ['autodocs'],
argTypes: {
label: {control: 'text', description: 'Label text (required)'},
@@ -70,12 +70,12 @@ const meta: Meta<typeof XDSDateRangePicker> = {
};
export default meta;
-type Story = StoryObj<typeof XDSDateRangePicker>;
+type Story = StoryObj<typeof XDSDateRangeInput>;
export const Default: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Date range',
@@ -88,7 +88,7 @@ export const WithValue: Story = {
start: '2026-03-10' as ISODateString,
end: '2026-03-20' as ISODateString,
});
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Report period',
@@ -98,7 +98,7 @@ export const WithValue: Story = {
export const WithPresets: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Date range',
@@ -112,7 +112,7 @@ export const WithPresetsAndValue: Story = {
start: daysAgo(7),
end: today(),
});
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Analytics period',
@@ -123,7 +123,7 @@ export const WithPresetsAndValue: Story = {
export const WithDescription: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Coverage period',
@@ -134,7 +134,7 @@ export const WithDescription: Story = {
export const WithMinMax: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Booking dates',
@@ -147,7 +147,7 @@ export const WithMinMax: Story = {
export const Optional: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Filter by date',
@@ -158,7 +158,7 @@ export const Optional: Story = {
export const Required: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Coverage period',
@@ -172,7 +172,7 @@ export const Disabled: Story = {
start: '2026-03-10' as ISODateString,
end: '2026-03-20' as ISODateString,
});
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Locked range',
@@ -183,7 +183,7 @@ export const Disabled: Story = {
export const SmallSize: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Date range',
@@ -194,7 +194,7 @@ export const SmallSize: Story = {
export const SingleMonth: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Date range',
@@ -205,7 +205,7 @@ export const SingleMonth: Story = {
export const WithErrorStatus: Story = {
render: args => {
const [value, setValue] = useState<XDSDateRange | null>(null);
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Date range',
@@ -219,7 +219,7 @@ export const WithWarningStatus: Story = {
start: '2026-03-01' as ISODateString,
end: '2026-06-30' as ISODateString,
});
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Date range',
@@ -233,7 +233,7 @@ export const NoClear: Story = {
start: '2026-03-10' as ISODateString,
end: '2026-03-20' as ISODateString,
});
- return <XDSDateRangePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateRangeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Required range',
@@ -263,21 +263,21 @@ export const AllVariations: Story = {
gap: '16px',
maxWidth: '340px',
}}>
- <XDSDateRangePicker label="Default" value={v1} onChange={setV1} />
- <XDSDateRangePicker label="With value" value={v2} onChange={setV2} />
- <XDSDateRangePicker
+ <XDSDateRangeInput label="Default" value={v1} onChange={setV1} />
+ <XDSDateRangeInput label="With value" value={v2} onChange={setV2} />
+ <XDSDateRangeInput
label="With presets"
value={v3}
onChange={setV3}
presets={defaultPresets}
/>
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Disabled"
isDisabled
value={v4}
onChange={setV4}
/>
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="With error"
value={v5}
onChange={setV5}
diff --git a/apps/storybook/stories/DateTimePicker.stories.tsx b/apps/storybook/stories/DateTimeInput.stories.tsx
similarity index 82%
rename from apps/storybook/stories/DateTimePicker.stories.tsx
rename to apps/storybook/stories/DateTimeInput.stories.tsx
index 55bdb51c7d..bc14e4cfd0 100644
--- a/apps/storybook/stories/DateTimePicker.stories.tsx
+++ b/apps/storybook/stories/DateTimeInput.stories.tsx
@@ -2,12 +2,12 @@
import {useState} from 'react';
import type {Meta, StoryObj} from '@storybook/react';
-import {XDSDateTimePicker} from '@xds/core/DateTimePicker';
-import type {ISODateTimeString} from '@xds/core/DateTimePicker';
+import {XDSDateTimeInput} from '@xds/core/DateTimeInput';
+import type {ISODateTimeString} from '@xds/core/DateTimeInput';
-const meta: Meta<typeof XDSDateTimePicker> = {
- title: 'Core/Inputs/DateTimePicker',
- component: XDSDateTimePicker,
+const meta: Meta<typeof XDSDateTimeInput> = {
+ title: 'Core/Inputs/DateTimeInput',
+ component: XDSDateTimeInput,
tags: ['autodocs'],
argTypes: {
label: {
@@ -72,14 +72,14 @@ const meta: Meta<typeof XDSDateTimePicker> = {
};
export default meta;
-type Story = StoryObj<typeof XDSDateTimePicker>;
+type Story = StoryObj<typeof XDSDateTimeInput>;
export const Default: Story = {
render: args => {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Meeting time',
@@ -92,7 +92,7 @@ export const WithValue: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T14:30' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Event time',
@@ -104,7 +104,7 @@ export const TwentyFourHourFormat: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T14:30' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Appointment',
@@ -117,7 +117,7 @@ export const WithSeconds: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T14:30:45' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Log timestamp',
@@ -130,7 +130,7 @@ export const WithDescription: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Deadline',
@@ -144,7 +144,7 @@ export const WithClearButton: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T09:00' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Start time',
@@ -157,7 +157,7 @@ export const WithMinMax: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Appointment',
@@ -172,7 +172,7 @@ export const WithTimeIncrement: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T09:00' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Time slot',
@@ -186,7 +186,7 @@ export const Optional: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Preferred time',
@@ -200,7 +200,7 @@ export const Required: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Start time',
@@ -213,7 +213,7 @@ export const Disabled: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T10:00' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Locked time',
@@ -226,7 +226,7 @@ export const SmallSize: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Time',
@@ -239,7 +239,7 @@ export const TwoMonthCalendar: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
undefined,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Travel departure',
@@ -252,7 +252,7 @@ export const WithErrorStatus: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T14:30' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Event time',
@@ -268,7 +268,7 @@ export const WithWarningStatus: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T07:00' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Meeting time',
@@ -284,7 +284,7 @@ export const WithSuccessStatus: Story = {
const [value, setValue] = useState<ISODateTimeString | undefined>(
'2026-03-15T10:00' as ISODateTimeString,
);
- return <XDSDateTimePicker {...args} value={value} onChange={setValue} />;
+ return <XDSDateTimeInput {...args} value={value} onChange={setValue} />;
},
args: {
label: 'Scheduled time',
@@ -324,36 +324,36 @@ export const AllVariations: Story = {
gap: '16px',
maxWidth: '460px',
}}>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Default"
value={value1}
onChange={setValue1}
placeholder="Select a date"
/>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="With value (12h)"
value={value2}
onChange={setValue2}
/>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="24-hour format"
value={value3}
onChange={setValue3}
hourFormat="24h"
/>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="With description"
description="Pick your preferred datetime"
value={value4}
onChange={setValue4}
/>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Disabled"
isDisabled
value={value5}
onChange={setValue5}
/>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="With error"
value={value6}
onChange={setValue6}
diff --git a/packages/cli/src/codemods/__tests__/registry.test.mjs b/packages/cli/src/codemods/__tests__/registry.test.mjs
index e749dd6f0e..e887685296 100644
--- a/packages/cli/src/codemods/__tests__/registry.test.mjs
+++ b/packages/cli/src/codemods/__tests__/registry.test.mjs
@@ -6,7 +6,7 @@ import {versions, getTransformsBetween} from '../registry.mjs';
describe('registry', () => {
describe('versions', () => {
test('are sorted in ascending semver order across digit boundaries', () => {
- expect(versions).toEqual(['0.0.2', '0.0.6', '0.0.7', '0.0.8', '0.0.10', '0.0.12', '0.0.13', '0.0.14']);
+ expect(versions).toEqual(['0.0.2', '0.0.6', '0.0.7', '0.0.8', '0.0.10', '0.0.12', '0.0.13', '0.0.14', '0.0.15']);
});
});
diff --git a/packages/cli/src/codemods/registry.mjs b/packages/cli/src/codemods/registry.mjs
index 27797b32e4..6e511daf98 100644
--- a/packages/cli/src/codemods/registry.mjs
+++ b/packages/cli/src/codemods/registry.mjs
@@ -16,6 +16,7 @@ const registry = new Map([
['0.0.12', () => import('./transforms/v0.0.12/index.mjs')],
['0.0.13', () => import('./transforms/v0.0.13/index.mjs')],
['0.0.14', () => import('./transforms/v0.0.14/index.mjs')],
+ ['0.0.15', () => import('./transforms/v0.0.15/index.mjs')],
]);
/**
diff --git a/packages/cli/src/codemods/transforms/v0.0.15/__tests__/rename-date-picker-to-input.test.mjs b/packages/cli/src/codemods/transforms/v0.0.15/__tests__/rename-date-picker-to-input.test.mjs
new file mode 100644
index 0000000000..467a8410b1
--- /dev/null
+++ b/packages/cli/src/codemods/transforms/v0.0.15/__tests__/rename-date-picker-to-input.test.mjs
@@ -0,0 +1,110 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+import {describe, it, expect} from 'vitest';
+
+async function applyTransform(source) {
+ const {default: transform} = await import(
+ '../rename-date-picker-to-input.mjs'
+ );
+ const jscodeshift = (await import('jscodeshift')).default;
+ const j = jscodeshift.withParser('tsx');
+ const api = {jscodeshift: j, stats: () => {}, report: () => {}};
+ const file = {source, path: 'test.tsx'};
+ const result = transform(file, api);
+ return result ?? source;
+}
+
+describe('rename-date-picker-to-input', () => {
+ it('renames XDSDateTimePicker import path', async () => {
+ const input = `import { XDSDateTimePicker } from '@xds/core/DateTimePicker';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('@xds/core/DateTimeInput');
+ expect(output).toContain('XDSDateTimeInput');
+ expect(output).not.toContain('DateTimePicker');
+ });
+
+ it('renames XDSDateRangePicker import path', async () => {
+ const input = `import { XDSDateRangePicker } from '@xds/core/DateRangePicker';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('@xds/core/DateRangeInput');
+ expect(output).toContain('XDSDateRangeInput');
+ expect(output).not.toContain('DateRangePicker');
+ });
+
+ it('renames JSX element names', async () => {
+ const input = `<XDSDateTimePicker label="Pick" value={v} onChange={fn} />`;
+ const output = await applyTransform(input);
+ expect(output).toContain('<XDSDateTimeInput');
+ expect(output).not.toContain('XDSDateTimePicker');
+ });
+
+ it('renames type references', async () => {
+ const input = `import type { XDSDateTimePickerProps, XDSDateTimePickerSize } from '@xds/core/DateTimePicker';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('XDSDateTimeInputProps');
+ expect(output).toContain('XDSDateTimeInputSize');
+ expect(output).not.toContain('Picker');
+ });
+
+ it('renames DateRangePicker type references', async () => {
+ const input = `import type { XDSDateRangePickerProps, XDSDateRangePickerSize } from '@xds/core/DateRangePicker';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('XDSDateRangeInputProps');
+ expect(output).toContain('XDSDateRangeInputSize');
+ expect(output).not.toContain('Picker');
+ });
+
+ it('renames hour format type', async () => {
+ const input = `const fmt: XDSDateTimePickerHourFormat = '12h';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('XDSDateTimeInputHourFormat');
+ expect(output).not.toContain('Picker');
+ });
+
+ it('renames status types', async () => {
+ const input = `const s: XDSDateTimePickerStatus = { type: 'error', message: 'bad' };
+const t: XDSDateRangePickerStatusType = 'warning';`;
+ const output = await applyTransform(input);
+ expect(output).toContain('XDSDateTimeInputStatus');
+ expect(output).toContain('XDSDateRangeInputStatusType');
+ expect(output).not.toContain('Picker');
+ });
+
+ it('handles a full component file with both pickers', async () => {
+ const input = `import { XDSDateTimePicker } from '@xds/core/DateTimePicker';
+import { XDSDateRangePicker } from '@xds/core/DateRangePicker';
+
+function DateForm() {
+ return (
+ <div>
+ <XDSDateTimePicker label="Start" value={start} onChange={setStart} />
+ <XDSDateRangePicker label="Range" value={range} onChange={setRange} />
+ </div>
+ );
+}`;
+ const output = await applyTransform(input);
+ expect(output).toContain('@xds/core/DateTimeInput');
+ expect(output).toContain('@xds/core/DateRangeInput');
+ expect(output).toContain('<XDSDateTimeInput');
+ expect(output).toContain('<XDSDateRangeInput');
+ expect(output).not.toContain('Picker');
+ });
+
+ it('does not touch unrelated components', async () => {
+ const input = `<XDSDateInput label="Date" value={v} onChange={fn} />`;
+ const output = await applyTransform(input);
+ expect(output).toContain('XDSDateInput');
+ });
+
+ it('returns undefined when no changes needed', async () => {
+ const {default: transform} = await import(
+ '../rename-date-picker-to-input.mjs'
+ );
+ const jscodeshift = (await import('jscodeshift')).default;
+ const j = jscodeshift.withParser('tsx');
+ const api = {jscodeshift: j, stats: () => {}, report: () => {}};
+ const source = `<XDSDateInput label="Date" value={v} onChange={fn} />`;
+ const result = transform({source, path: 'test.tsx'}, api);
+ expect(result).toBeUndefined();
+ });
+});
diff --git a/packages/cli/src/codemods/transforms/v0.0.15/index.mjs b/packages/cli/src/codemods/transforms/v0.0.15/index.mjs
new file mode 100644
index 0000000000..4a9d3f32da
--- /dev/null
+++ b/packages/cli/src/codemods/transforms/v0.0.15/index.mjs
@@ -0,0 +1,19 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file v0.0.15 transform manifest
+ *
+ * Lists all codemods for the v0.0.15 release in the order they should run.
+ */
+
+import renameDatePickerToInput, {
+ meta as renameDatePickerToInputMeta,
+} from './rename-date-picker-to-input.mjs';
+
+export default [
+ {
+ name: 'rename-date-picker-to-input',
+ transform: renameDatePickerToInput,
+ meta: renameDatePickerToInputMeta,
+ },
+];
diff --git a/packages/cli/src/codemods/transforms/v0.0.15/rename-date-picker-to-input.mjs b/packages/cli/src/codemods/transforms/v0.0.15/rename-date-picker-to-input.mjs
new file mode 100644
index 0000000000..261f1e9d9e
--- /dev/null
+++ b/packages/cli/src/codemods/transforms/v0.0.15/rename-date-picker-to-input.mjs
@@ -0,0 +1,114 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Codemod: Rename DateTimePicker → DateTimeInput, DateRangePicker → DateRangeInput
+ *
+ * Renames components, types, and import paths for consistency with other
+ * input components (DateInput, TextInput, NumberInput).
+ *
+ * Handles:
+ * 1. Import source paths: '@xds/core/DateTimePicker' → '@xds/core/DateTimeInput'
+ * 2. Named imports/exports: XDSDateTimePicker → XDSDateTimeInput, etc.
+ * 3. JSX element names: <XDSDateTimePicker /> → <XDSDateTimeInput />
+ * 4. Type references: XDSDateTimePickerProps → XDSDateTimeInputProps, etc.
+ * 5. displayName strings
+ */
+
+export const meta = {
+ title: 'Rename DateTimePicker/DateRangePicker → DateTimeInput/DateRangeInput',
+ description:
+ 'Renames `XDSDateTimePicker` to `XDSDateTimeInput` and `XDSDateRangePicker` to `XDSDateRangeInput`, ' +
+ 'including props types, import paths, and JSX usage.',
+};
+
+const IMPORT_PATH_RENAMES = new Map([
+ ['@xds/core/DateTimePicker', '@xds/core/DateTimeInput'],
+ ['@xds/core/DateRangePicker', '@xds/core/DateRangeInput'],
+]);
+
+const IDENTIFIER_RENAMES = new Map([
+ // Components
+ ['XDSDateTimePicker', 'XDSDateTimeInput'],
+ ['XDSDateRangePicker', 'XDSDateRangeInput'],
+ // Props types
+ ['XDSDateTimePickerProps', 'XDSDateTimeInputProps'],
+ ['XDSDateRangePickerProps', 'XDSDateRangeInputProps'],
+ // Size types
+ ['XDSDateTimePickerSize', 'XDSDateTimeInputSize'],
+ ['XDSDateRangePickerSize', 'XDSDateRangeInputSize'],
+ // Hour format type
+ ['XDSDateTimePickerHourFormat', 'XDSDateTimeInputHourFormat'],
+ // Status types
+ ['XDSDateTimePickerStatus', 'XDSDateTimeInputStatus'],
+ ['XDSDateTimePickerStatusType', 'XDSDateTimeInputStatusType'],
+ ['XDSDateRangePickerStatus', 'XDSDateRangeInputStatus'],
+ ['XDSDateRangePickerStatusType', 'XDSDateRangeInputStatusType'],
+]);
+
+export default function transformer(file, api) {
+ const j = api.jscodeshift;
+ const root = j(file.source);
+ let hasChanges = false;
+
+ // 1. Rename import/export source paths
+ root.find(j.ImportDeclaration).forEach((path) => {
+ const source = path.node.source.value;
+ const renamed = IMPORT_PATH_RENAMES.get(source);
+ if (renamed) {
+ path.node.source.value = renamed;
+ hasChanges = true;
+ }
+ });
+
+ root.find(j.ExportNamedDeclaration).forEach((path) => {
+ if (path.node.source) {
+ const source = path.node.source.value;
+ const renamed = IMPORT_PATH_RENAMES.get(source);
+ if (renamed) {
+ path.node.source.value = renamed;
+ hasChanges = true;
+ }
+ }
+ });
+
+ // 2. Rename all identifiers (covers imports, type refs, variable names)
+ root.find(j.Identifier).forEach((path) => {
+ const renamed = IDENTIFIER_RENAMES.get(path.node.name);
+ if (renamed) {
+ path.node.name = renamed;
+ hasChanges = true;
+ }
+ });
+
+ // 3. Rename JSX element names
+ root.find(j.JSXIdentifier).forEach((path) => {
+ const renamed = IDENTIFIER_RENAMES.get(path.node.name);
+ if (renamed) {
+ path.node.name = renamed;
+ hasChanges = true;
+ }
+ });
+
+ // 4. Rename string literals (covers displayName assignments)
+ root.find(j.StringLiteral).forEach((path) => {
+ const renamed = IDENTIFIER_RENAMES.get(path.node.value);
+ if (renamed) {
+ path.node.value = renamed;
+ hasChanges = true;
+ }
+ });
+
+ // Also handle Literal nodes (parser-dependent)
+ root.find(j.Literal).forEach((path) => {
+ if (typeof path.node.value === 'string') {
+ const renamed = IDENTIFIER_RENAMES.get(path.node.value);
+ if (renamed) {
+ path.node.value = renamed;
+ if (path.node.raw) path.node.raw = undefined;
+ hasChanges = true;
+ }
+ }
+ });
+
+ return hasChanges ? root.toSource() : undefined;
+}
diff --git a/packages/cli/templates/blocks/components/DateRangePicker/DateRangePickerShowcase.doc.mjs b/packages/cli/templates/blocks/components/DateRangeInput/DateRangeInputShowcase.doc.mjs
similarity index 75%
rename from packages/cli/templates/blocks/components/DateRangePicker/DateRangePickerShowcase.doc.mjs
rename to packages/cli/templates/blocks/components/DateRangeInput/DateRangeInputShowcase.doc.mjs
index 5e58ef0529..2a6fa62159 100644
--- a/packages/cli/templates/blocks/components/DateRangePicker/DateRangePickerShowcase.doc.mjs
+++ b/packages/cli/templates/blocks/components/DateRangeInput/DateRangeInputShowcase.doc.mjs
@@ -3,12 +3,12 @@
/** @type {import('../../../../../core/src/docs-types').TemplateDoc} */
export const doc = {
type: 'block',
- exampleFor: 'DateRangePicker',
- name: 'DateRangePicker',
+ exampleFor: 'DateRangeInput',
+ name: 'DateRangeInput',
description:
'A date range picker with a button trigger and dual-month calendar popover with preset ranges.',
isReady: true,
isShowcase: true,
aspectRatio: 1,
- componentsUsed: ['DateRangePicker', 'Layout'],
+ componentsUsed: ['DateRangeInput', 'Layout'],
};
diff --git a/packages/cli/templates/blocks/components/DateRangePicker/DateRangePickerShowcase.tsx b/packages/cli/templates/blocks/components/DateRangeInput/DateRangeInputShowcase.tsx
similarity index 82%
rename from packages/cli/templates/blocks/components/DateRangePicker/DateRangePickerShowcase.tsx
rename to packages/cli/templates/blocks/components/DateRangeInput/DateRangeInputShowcase.tsx
index 99bc23d2a3..65694bfe7c 100644
--- a/packages/cli/templates/blocks/components/DateRangePicker/DateRangePickerShowcase.tsx
+++ b/packages/cli/templates/blocks/components/DateRangeInput/DateRangeInputShowcase.tsx
@@ -3,8 +3,8 @@
'use client';
import {useState} from 'react';
-import {XDSDateRangePicker} from '@xds/core/DateRangePicker';
-import type {XDSDateRange} from '@xds/core/DateRangePicker';
+import {XDSDateRangeInput} from '@xds/core/DateRangeInput';
+import type {XDSDateRange} from '@xds/core/DateRangeInput';
import type {ISODateString} from '@xds/core/Calendar';
import {XDSStack} from '@xds/core/Layout';
@@ -23,12 +23,12 @@ const presets = [
{label: 'Last 30 days', getRange: () => ({start: daysAgo(30), end: today()})},
];
-export default function DateRangePickerShowcase() {
+export default function DateRangeInputShowcase() {
const [range, setRange] = useState<XDSDateRange | null>(null);
return (
<XDSStack direction="vertical" width="100%" style={{maxWidth: 400}}>
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Date range"
value={range}
onChange={setRange}
diff --git a/packages/cli/templates/blocks/components/DateTimePicker/DateTimePickerShowcase.doc.mjs b/packages/cli/templates/blocks/components/DateTimeInput/DateTimeInputShowcase.doc.mjs
similarity index 76%
rename from packages/cli/templates/blocks/components/DateTimePicker/DateTimePickerShowcase.doc.mjs
rename to packages/cli/templates/blocks/components/DateTimeInput/DateTimeInputShowcase.doc.mjs
index bce17bf54e..39d54370c1 100644
--- a/packages/cli/templates/blocks/components/DateTimePicker/DateTimePickerShowcase.doc.mjs
+++ b/packages/cli/templates/blocks/components/DateTimeInput/DateTimeInputShowcase.doc.mjs
@@ -3,12 +3,12 @@
/** @type {import('../../../../../core/src/docs-types').TemplateDoc} */
export const doc = {
type: 'block',
- exampleFor: 'DateTimePicker',
- name: 'DateTimePicker',
+ exampleFor: 'DateTimeInput',
+ name: 'DateTimeInput',
description:
'A combined date and time picker. Click to open a calendar popover with a time input below.',
isReady: true,
isShowcase: true,
aspectRatio: 1,
- componentsUsed: ['DateTimePicker', 'Layout'],
+ componentsUsed: ['DateTimeInput', 'Layout'],
};
diff --git a/packages/cli/templates/blocks/components/DateTimePicker/DateTimePickerShowcase.tsx b/packages/cli/templates/blocks/components/DateTimeInput/DateTimeInputShowcase.tsx
similarity index 71%
rename from packages/cli/templates/blocks/components/DateTimePicker/DateTimePickerShowcase.tsx
rename to packages/cli/templates/blocks/components/DateTimeInput/DateTimeInputShowcase.tsx
index ad16843298..f9a0333569 100644
--- a/packages/cli/templates/blocks/components/DateTimePicker/DateTimePickerShowcase.tsx
+++ b/packages/cli/templates/blocks/components/DateTimeInput/DateTimeInputShowcase.tsx
@@ -3,18 +3,18 @@
'use client';
import {useState} from 'react';
-import {XDSDateTimePicker} from '@xds/core/DateTimePicker';
-import type {ISODateTimeString} from '@xds/core/DateTimePicker';
+import {XDSDateTimeInput} from '@xds/core/DateTimeInput';
+import type {ISODateTimeString} from '@xds/core/DateTimeInput';
import {XDSStack} from '@xds/core/Layout';
-export default function DateTimePickerShowcase() {
+export default function DateTimeInputShowcase() {
const [dateTime, setDateTime] = useState<ISODateTimeString | undefined>(
undefined,
);
return (
<XDSStack direction="vertical" width="100%" style={{maxWidth: 400}}>
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting time"
placeholder="Select a date"
value={dateTime}
diff --git a/packages/core/package.json b/packages/core/package.json
index a679a70043..702b0c77d6 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -217,17 +217,17 @@
"import": "./dist/DateInput/index.mjs",
"require": "./dist/DateInput/index.js"
},
- "./DateRangePicker": {
- "source": "./src/DateRangePicker/index.ts",
- "types": "./dist/DateRangePicker/index.d.ts",
- "import": "./dist/DateRangePicker/index.mjs",
- "require": "./dist/DateRangePicker/index.js"
- },
- "./DateTimePicker": {
- "source": "./src/DateTimePicker/index.ts",
- "types": "./dist/DateTimePicker/index.d.ts",
- "import": "./dist/DateTimePicker/index.mjs",
- "require": "./dist/DateTimePicker/index.js"
+ "./DateRangeInput": {
+ "source": "./src/DateRangeInput/index.ts",
+ "types": "./dist/DateRangeInput/index.d.ts",
+ "import": "./dist/DateRangeInput/index.mjs",
+ "require": "./dist/DateRangeInput/index.js"
+ },
+ "./DateTimeInput": {
+ "source": "./src/DateTimeInput/index.ts",
+ "types": "./dist/DateTimeInput/index.d.ts",
+ "import": "./dist/DateTimeInput/index.mjs",
+ "require": "./dist/DateTimeInput/index.js"
},
"./Dialog": {
"source": "./src/Dialog/index.ts",
diff --git a/packages/core/src/DateInput/XDSDateInput.test.tsx b/packages/core/src/DateInput/XDSDateInput.test.tsx
index 1a338ec9a6..90f11c7d40 100644
--- a/packages/core/src/DateInput/XDSDateInput.test.tsx
+++ b/packages/core/src/DateInput/XDSDateInput.test.tsx
@@ -296,16 +296,16 @@ describe('XDSDateInput', () => {
);
});
- // --- P1: Tab order input-first, button-second ---
+ // --- P1: Tab order: calendar button first, then input ---
- it('renders input before button in DOM order', () => {
+ it('renders calendar button before input in DOM order', () => {
const {container} = render(
<XDSDateInput label="Date" onChange={() => {}} />,
);
const input = container.querySelector('input');
const button = container.querySelector('button');
- // Input should come before button in the DOM
- expect(input!.compareDocumentPosition(button!)).toBe(
+ // Calendar button should come before input in the DOM
+ expect(button!.compareDocumentPosition(input!)).toBe(
Node.DOCUMENT_POSITION_FOLLOWING,
);
});
diff --git a/packages/core/src/DateInput/XDSDateInput.tsx b/packages/core/src/DateInput/XDSDateInput.tsx
index e766c7de59..c5cf170bbf 100644
--- a/packages/core/src/DateInput/XDSDateInput.tsx
+++ b/packages/core/src/DateInput/XDSDateInput.tsx
@@ -517,6 +517,17 @@ export function XDSDateInput({
className,
style,
)}>
+ <button
+ type="button"
+ onClick={handleToggle}
+ disabled={isEffectivelyDisabled}
+ aria-label={popover.isOpen ? 'Close calendar' : 'Open calendar'}
+ {...stylex.props(
+ styles.iconButton,
+ isEffectivelyDisabled && styles.iconButtonDisabled,
+ )}>
+ <XDSIcon icon="calendar" size="sm" color="secondary" />
+ </button>
<input
ref={setRefs}
id={id}
@@ -553,17 +564,6 @@ export function XDSDateInput({
<XDSIcon icon="close" size="sm" color="secondary" />
</button>
)}
- <button
- type="button"
- onClick={handleToggle}
- disabled={isEffectivelyDisabled}
- aria-label={popover.isOpen ? 'Close calendar' : 'Open calendar'}
- {...stylex.props(
- styles.iconButton,
- isEffectivelyDisabled && styles.iconButtonDisabled,
- )}>
- <XDSIcon icon="calendar" size="sm" color="secondary" />
- </button>
{isBusy && <XDSSpinner size="sm" />}
{status && (
<XDSIcon
diff --git a/packages/core/src/DateRangePicker/DateRangePicker.doc.mjs b/packages/core/src/DateRangeInput/DateRangeInput.doc.mjs
similarity index 90%
rename from packages/core/src/DateRangePicker/DateRangePicker.doc.mjs
rename to packages/core/src/DateRangeInput/DateRangeInput.doc.mjs
index 662d359528..1aa9e1eaa5 100644
--- a/packages/core/src/DateRangePicker/DateRangePicker.doc.mjs
+++ b/packages/core/src/DateRangeInput/DateRangeInput.doc.mjs
@@ -3,7 +3,7 @@
/** @type {import('../docs-types').ComponentDoc} */
export const docs = {
- name: 'DateRangePicker',
+ name: 'DateRangeInput',
keywords: ["daterangepicker","daterange","range","calendar","filter","analytics","period","schedule"],
props: [
{ name: 'label', type: 'string', description: 'Label text.', required: true },
@@ -30,17 +30,17 @@ export const docs = {
],
theming: {
targets: [
- { className: 'xds-date-range-picker', visualProps: ['size', 'status'] },
+ { className: 'xds-date-range-input', visualProps: ['size', 'status'] },
],
},
usage: {
- description: 'DateRangePicker lets users select a start and end date from a dual-month calendar popover. Use it for filtering data by time period, report generation, analytics dashboards, and booking flows.',
+ description: 'DateRangeInput lets users select a start and end date from a dual-month calendar popover. Use it for filtering data by time period, report generation, analytics dashboards, and booking flows.',
bestPractices: [
{ guidance: true, description: 'Use presets for common ranges like "Last 7 days" to speed up selection.' },
{ guidance: true, description: 'Use min/max to constrain selectable dates to valid ranges.' },
{ guidance: true, description: 'Keep hasClear enabled (default) so users can reset the filter.' },
{ guidance: true, description: 'Provide clear labels and descriptions so users understand what the range controls.' },
- { guidance: false, description: 'Use DateRangePicker when only a single date is needed — use DateInput instead.' },
+ { guidance: false, description: 'Use DateRangeInput when only a single date is needed — use DateInput instead.' },
{ guidance: false, description: 'Hide the label without surrounding context that makes the purpose obvious.' },
],
anatomy: [
@@ -59,7 +59,7 @@ export const docs = {
export const docsDense = {
description: 'date range picker with dual-month calendar popover and preset ranges',
usage: {
- description: 'DateRangePicker lets users select start+end dates from a dual-month calendar. Use for filtering, reports, analytics, and booking.',
+ description: 'DateRangeInput lets users select start+end dates from a dual-month calendar. Use for filtering, reports, analytics, and booking.',
bestPractices: [
{ guidance: true, description: 'Use presets for common ranges. Use min/max for constraints.' },
{ guidance: true, description: 'Keep hasClear enabled. Provide clear labels.' },
diff --git a/packages/core/src/DateRangePicker/XDSDateRangePicker.test.tsx b/packages/core/src/DateRangeInput/XDSDateRangeInput.test.tsx
similarity index 83%
rename from packages/core/src/DateRangePicker/XDSDateRangePicker.test.tsx
rename to packages/core/src/DateRangeInput/XDSDateRangeInput.test.tsx
index 623ceba000..7dba8e8af2 100644
--- a/packages/core/src/DateRangePicker/XDSDateRangePicker.test.tsx
+++ b/packages/core/src/DateRangeInput/XDSDateRangeInput.test.tsx
@@ -1,42 +1,38 @@
/**
- * @file XDSDateRangePicker.test.tsx
- * @input Uses vitest, @testing-library/react, XDSDateRangePicker component
- * @output Unit tests for XDSDateRangePicker component behavior
- * @position Testing; validates XDSDateRangePicker.tsx implementation
+ * @file XDSDateRangeInput.test.tsx
+ * @input Uses vitest, @testing-library/react, XDSDateRangeInput component
+ * @output Unit tests for XDSDateRangeInput component behavior
+ * @position Testing; validates XDSDateRangeInput.tsx implementation
*
- * SYNC: When XDSDateRangePicker.tsx changes, update tests to match new behavior
+ * SYNC: When XDSDateRangeInput.tsx changes, update tests to match new behavior
*/
// Copyright (c) Meta Platforms, Inc. and affiliates.
import {describe, it, expect, vi} from 'vitest';
import {render, screen, fireEvent} from '@testing-library/react';
-import {XDSDateRangePicker} from './XDSDateRangePicker';
-import type {XDSDateRange} from './XDSDateRangePicker';
+import {XDSDateRangeInput} from './XDSDateRangeInput';
+import type {XDSDateRange} from './XDSDateRangeInput';
import type {ISODateString} from '../Calendar';
-describe('XDSDateRangePicker', () => {
+describe('XDSDateRangeInput', () => {
it('renders with label', () => {
render(
- <XDSDateRangePicker
- label="Date range"
- value={null}
- onChange={() => {}}
- />,
+ <XDSDateRangeInput label="Date range" value={null} onChange={() => {}} />,
);
expect(screen.getByText('Date range')).toBeInTheDocument();
});
it('renders placeholder when value is null', () => {
render(
- <XDSDateRangePicker label="Range" value={null} onChange={() => {}} />,
+ <XDSDateRangeInput label="Range" value={null} onChange={() => {}} />,
);
expect(screen.getByText('Select date range')).toBeInTheDocument();
});
it('renders custom placeholder', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={null}
onChange={() => {}}
@@ -52,7 +48,7 @@ describe('XDSDateRangePicker', () => {
end: '2026-03-22' as ISODateString,
};
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={range}
onChange={() => {}}
@@ -68,7 +64,7 @@ describe('XDSDateRangePicker', () => {
it('forwards ref to trigger button', () => {
const ref = vi.fn();
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
ref={ref}
label="Range"
value={null}
@@ -80,7 +76,7 @@ describe('XDSDateRangePicker', () => {
it('visually hides label when isLabelHidden is true', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
isLabelHidden
value={null}
@@ -92,7 +88,7 @@ describe('XDSDateRangePicker', () => {
it('sets aria-required when isRequired is true', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
isRequired
value={null}
@@ -105,7 +101,7 @@ describe('XDSDateRangePicker', () => {
it('does not set aria-required when isRequired is false', () => {
render(
- <XDSDateRangePicker label="Range" value={null} onChange={() => {}} />,
+ <XDSDateRangeInput label="Range" value={null} onChange={() => {}} />,
);
const trigger = screen.getByRole('button', {name: /Range/});
expect(trigger).not.toHaveAttribute('aria-required');
@@ -113,7 +109,7 @@ describe('XDSDateRangePicker', () => {
it('disables trigger when isDisabled is true', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
isDisabled
value={null}
@@ -126,7 +122,7 @@ describe('XDSDateRangePicker', () => {
it('is not disabled by default', () => {
render(
- <XDSDateRangePicker label="Range" value={null} onChange={() => {}} />,
+ <XDSDateRangeInput label="Range" value={null} onChange={() => {}} />,
);
const trigger = screen.getByRole('button', {name: /Range/});
expect(trigger).not.toBeDisabled();
@@ -134,7 +130,7 @@ describe('XDSDateRangePicker', () => {
it('trigger has aria-haspopup="dialog"', () => {
render(
- <XDSDateRangePicker label="Range" value={null} onChange={() => {}} />,
+ <XDSDateRangeInput label="Range" value={null} onChange={() => {}} />,
);
const trigger = screen.getByRole('button', {name: /Range/});
expect(trigger).toHaveAttribute('aria-haspopup', 'dialog');
@@ -142,7 +138,7 @@ describe('XDSDateRangePicker', () => {
it('trigger has aria-expanded=false by default', () => {
render(
- <XDSDateRangePicker label="Range" value={null} onChange={() => {}} />,
+ <XDSDateRangeInput label="Range" value={null} onChange={() => {}} />,
);
const trigger = screen.getByRole('button', {name: /Range/});
expect(trigger).toHaveAttribute('aria-expanded', 'false');
@@ -150,7 +146,7 @@ describe('XDSDateRangePicker', () => {
it('renders status icon for error status', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={null}
onChange={() => {}}
@@ -163,7 +159,7 @@ describe('XDSDateRangePicker', () => {
it('does not set aria-invalid for warning status', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={null}
onChange={() => {}}
@@ -176,7 +172,7 @@ describe('XDSDateRangePicker', () => {
it('renders description', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
description="Pick a date range"
value={null}
@@ -188,7 +184,7 @@ describe('XDSDateRangePicker', () => {
it('links status message via aria-describedby', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={null}
onChange={() => {}}
@@ -207,7 +203,7 @@ describe('XDSDateRangePicker', () => {
it('calendar icon button is present', () => {
render(
- <XDSDateRangePicker label="Range" value={null} onChange={() => {}} />,
+ <XDSDateRangeInput label="Range" value={null} onChange={() => {}} />,
);
expect(
screen.getByRole('button', {name: 'Open calendar'}),
@@ -216,7 +212,7 @@ describe('XDSDateRangePicker', () => {
it('calendar icon button is disabled when isDisabled', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
isDisabled
value={null}
@@ -233,7 +229,7 @@ describe('XDSDateRangePicker', () => {
end: '2026-03-22' as ISODateString,
};
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={range}
onChange={() => {}}
@@ -247,7 +243,7 @@ describe('XDSDateRangePicker', () => {
it('does not show clear button when value is null', () => {
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={null}
onChange={() => {}}
@@ -265,7 +261,7 @@ describe('XDSDateRangePicker', () => {
end: '2026-03-22' as ISODateString,
};
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={range}
onChange={() => {}}
@@ -283,7 +279,7 @@ describe('XDSDateRangePicker', () => {
end: '2026-03-22' as ISODateString,
};
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={range}
onChange={() => {}}
@@ -303,7 +299,7 @@ describe('XDSDateRangePicker', () => {
end: '2026-03-22' as ISODateString,
};
render(
- <XDSDateRangePicker
+ <XDSDateRangeInput
label="Range"
value={range}
onChange={onChange}
diff --git a/packages/core/src/DateRangePicker/XDSDateRangePicker.tsx b/packages/core/src/DateRangeInput/XDSDateRangeInput.tsx
similarity index 93%
rename from packages/core/src/DateRangePicker/XDSDateRangePicker.tsx
rename to packages/core/src/DateRangeInput/XDSDateRangeInput.tsx
index c9ec5f683b..825537aa6d 100644
--- a/packages/core/src/DateRangePicker/XDSDateRangePicker.tsx
+++ b/packages/core/src/DateRangeInput/XDSDateRangeInput.tsx
@@ -3,17 +3,17 @@
'use client';
/**
- * @file XDSDateRangePicker.tsx
+ * @file XDSDateRangeInput.tsx
* @input Uses React, XDSField, XDSCalendar (range mode), useXDSPopover
- * @output Exports XDSDateRangePicker component, XDSDateRangePickerProps
- * @position Core implementation; consumed by index.ts, tested by XDSDateRangePicker.test.tsx
+ * @output Exports XDSDateRangeInput component, XDSDateRangeInputProps
+ * @position Core implementation; consumed by index.ts, tested by XDSDateRangeInput.test.tsx
*
* SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/DateRangePicker/DateRangePicker.doc.mjs (props table, features, implementation notes)
- * - /packages/core/src/DateRangePicker/XDSDateRangePicker.test.tsx (tests for new/changed behavior)
- * - /packages/core/src/DateRangePicker/index.ts (exports if types change)
- * - /apps/storybook/stories/DateRangePicker.stories.tsx (storybook stories)
- * - /packages/cli/templates/blocks/components/DateRangePicker/ (showcase blocks)
+ * - /packages/core/src/DateRangeInput/DateRangeInput.doc.mjs (props table, features, implementation notes)
+ * - /packages/core/src/DateRangeInput/XDSDateRangeInput.test.tsx (tests for new/changed behavior)
+ * - /packages/core/src/DateRangeInput/index.ts (exports if types change)
+ * - /apps/storybook/stories/DateRangeInput.stories.tsx (storybook stories)
+ * - /packages/cli/templates/blocks/components/DateRangeInput/ (showcase blocks)
*/
import {useId, useCallback, useMemo, useOptimistic, useTransition} from 'react';
@@ -52,11 +52,11 @@ export interface XDSDateRangePreset {
getRange: () => DateRange;
}
-export type XDSDateRangePickerSize = 'sm' | 'md';
+export type XDSDateRangeInputSize = 'sm' | 'md';
export type {
- XDSInputStatus as XDSDateRangePickerStatus,
- XDSInputStatusType as XDSDateRangePickerStatusType,
+ XDSInputStatus as XDSDateRangeInputStatus,
+ XDSInputStatusType as XDSDateRangeInputStatusType,
} from '../Field';
const styles = stylex.create({
@@ -204,7 +204,7 @@ function isRangeEqual(a: DateRange | null, b: DateRange | null): boolean {
return a.start === b.start && a.end === b.end;
}
-export interface XDSDateRangePickerProps extends Omit<
+export interface XDSDateRangeInputProps extends Omit<
XDSBaseProps,
'onChange' | 'defaultValue'
> {
@@ -304,7 +304,7 @@ export interface XDSDateRangePickerProps extends Omit<
* The size of the trigger.
* @default 'md'
*/
- size?: XDSDateRangePickerSize;
+ size?: XDSDateRangeInputSize;
/**
* Status indicator for the input.
@@ -334,7 +334,7 @@ export interface XDSDateRangePickerProps extends Omit<
*
* @example
* ```
- * <XDSDateRangePicker
+ * <XDSDateRangeInput
* label="Date range"
* value={range}
* onChange={setRange}
@@ -344,7 +344,7 @@ export interface XDSDateRangePickerProps extends Omit<
* />
* ```
*/
-export function XDSDateRangePicker({
+export function XDSDateRangeInput({
label,
isLabelHidden = false,
description,
@@ -370,7 +370,7 @@ export function XDSDateRangePicker({
style,
ref,
...rest
-}: XDSDateRangePickerProps) {
+}: XDSDateRangeInputProps) {
const id = useId();
const descriptionID = useId();
const statusMessageID = useId();
@@ -491,7 +491,7 @@ export function XDSDateRangePicker({
ref={popover.triggerRef}
{...rest}
{...mergeProps(
- xdsClassName('date-range-picker', {
+ xdsClassName('date-range-input', {
size,
status: status?.type ?? null,
}),
@@ -507,6 +507,18 @@ export function XDSDateRangePicker({
className,
style,
)}>
+ <button
+ type="button"
+ onClick={handleToggle}
+ disabled={isEffectivelyDisabled}
+ aria-label={popover.isOpen ? 'Close calendar' : 'Open calendar'}
+ tabIndex={-1}
+ {...stylex.props(
+ styles.iconButton,
+ isEffectivelyDisabled && styles.iconButtonDisabled,
+ )}>
+ <XDSIcon icon="calendar" size="sm" color="secondary" />
+ </button>
<button
ref={ref}
id={id}
@@ -537,18 +549,6 @@ export function XDSDateRangePicker({
<XDSIcon icon="close" size="sm" color="secondary" />
</button>
)}
- <button
- type="button"
- onClick={handleToggle}
- disabled={isEffectivelyDisabled}
- aria-label={popover.isOpen ? 'Close calendar' : 'Open calendar'}
- tabIndex={-1}
- {...stylex.props(
- styles.iconButton,
- isEffectivelyDisabled && styles.iconButtonDisabled,
- )}>
- <XDSIcon icon="calendar" size="sm" color="secondary" />
- </button>
{isBusy && <XDSSpinner size="sm" />}
{status && (
<XDSIcon
@@ -601,4 +601,4 @@ export function XDSDateRangePicker({
);
}
-XDSDateRangePicker.displayName = 'XDSDateRangePicker';
+XDSDateRangeInput.displayName = 'XDSDateRangeInput';
diff --git a/packages/core/src/DateRangeInput/index.ts b/packages/core/src/DateRangeInput/index.ts
new file mode 100644
index 0000000000..d26eef4f90
--- /dev/null
+++ b/packages/core/src/DateRangeInput/index.ts
@@ -0,0 +1,20 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+'use client';
+
+/**
+ * @file index.ts
+ * @input DateRangeInput component exports
+ * @output Re-exports XDSDateRangeInput and types
+ * @position Package entry point for DateRangeInput
+ */
+
+export {XDSDateRangeInput} from './XDSDateRangeInput';
+export type {
+ XDSDateRangeInputProps,
+ XDSDateRangeInputSize,
+ XDSDateRangeInputStatus,
+ XDSDateRangeInputStatusType,
+ XDSDateRange,
+ XDSDateRangePreset,
+} from './XDSDateRangeInput';
diff --git a/packages/core/src/DateRangePicker/index.ts b/packages/core/src/DateRangePicker/index.ts
deleted file mode 100644
index ba558c8f57..0000000000
--- a/packages/core/src/DateRangePicker/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
-
-'use client';
-
-/**
- * @file index.ts
- * @input DateRangePicker component exports
- * @output Re-exports XDSDateRangePicker and types
- * @position Package entry point for DateRangePicker
- */
-
-export {XDSDateRangePicker} from './XDSDateRangePicker';
-export type {
- XDSDateRangePickerProps,
- XDSDateRangePickerSize,
- XDSDateRangePickerStatus,
- XDSDateRangePickerStatusType,
- XDSDateRange,
- XDSDateRangePreset,
-} from './XDSDateRangePicker';
diff --git a/packages/core/src/DateTimePicker/DateTimePicker.doc.mjs b/packages/core/src/DateTimeInput/DateTimeInput.doc.mjs
similarity index 89%
rename from packages/core/src/DateTimePicker/DateTimePicker.doc.mjs
rename to packages/core/src/DateTimeInput/DateTimeInput.doc.mjs
index 77b83657d4..f5993f503e 100644
--- a/packages/core/src/DateTimePicker/DateTimePicker.doc.mjs
+++ b/packages/core/src/DateTimeInput/DateTimeInput.doc.mjs
@@ -3,7 +3,7 @@
/** @type {import('../docs-types').ComponentDoc} */
export const docs = {
- name: 'DateTimePicker',
+ name: 'DateTimeInput',
keywords: ["datetimepicker","datetime","datepicker","timepicker","calendar","schedule","event","deadline","timestamp"],
props: [
{
@@ -139,18 +139,18 @@ export const docs = {
],
theming: {
targets: [
- {className: 'xds-date-time-picker', visualProps: ['size', 'status']},
+ {className: 'xds-date-time-input', visualProps: ['size', 'status']},
],
},
usage: {
- description: 'DateTimePicker combines a calendar popover with a time input for selecting both a date and time in a single interaction flow. Use it for scheduling, event creation, deadline setting, or any form field that needs a specific datetime.',
+ description: 'DateTimeInput combines a calendar popover with a time input for selecting both a date and time in a single interaction flow. Use it for scheduling, event creation, deadline setting, or any form field that needs a specific datetime.',
bestPractices: [
{ guidance: true, description: 'Provide clear labels and descriptions so users understand what datetime is expected.' },
{ guidance: true, description: 'Use min and max to restrict selectable datetimes to valid ranges.' },
{ guidance: true, description: 'Use hasClear when the datetime is optional so the user can easily reset it.' },
{ guidance: true, description: 'Choose the hour format (12h or 24h) that matches your audience’s locale.' },
- { guidance: false, description: 'Use DateTimePicker when only a date is needed — use DateInput instead.' },
- { guidance: false, description: 'Use DateTimePicker when only a time is needed — use TimeInput instead.' },
+ { guidance: false, description: 'Use DateTimeInput when only a date is needed — use DateInput instead.' },
+ { guidance: false, description: 'Use DateTimeInput when only a time is needed — use TimeInput instead.' },
{ guidance: false, description: 'Hide the label without surrounding context that makes the field purpose obvious.' },
],
anatomy: [
@@ -167,16 +167,16 @@ export const docs = {
/** @type {import('../docs-types').ComponentDoc} */
export const docsZh = {
- name: 'DateTimePicker',
+ name: 'DateTimeInput',
usage: {
- description: 'DateTimePicker combines a calendar popover with a time input for selecting both a date and time in a single interaction flow. Use it for scheduling, event creation, deadline setting, or any form field that needs a specific datetime.',
+ description: 'DateTimeInput combines a calendar popover with a time input for selecting both a date and time in a single interaction flow. Use it for scheduling, event creation, deadline setting, or any form field that needs a specific datetime.',
bestPractices: [
{ guidance: true, description: 'Provide clear labels and descriptions so users understand what datetime is expected.' },
{ guidance: true, description: 'Use min and max to restrict selectable datetimes to valid ranges.' },
{ guidance: true, description: 'Use hasClear when the datetime is optional so the user can easily reset it.' },
{ guidance: true, description: 'Choose the hour format (12h or 24h) that matches your audience’s locale.' },
- { guidance: false, description: 'Use DateTimePicker when only a date is needed — use DateInput instead.' },
- { guidance: false, description: 'Use DateTimePicker when only a time is needed — use TimeInput instead.' },
+ { guidance: false, description: 'Use DateTimeInput when only a date is needed — use DateInput instead.' },
+ { guidance: false, description: 'Use DateTimeInput when only a time is needed — use TimeInput instead.' },
{ guidance: false, description: 'Hide the label without surrounding context that makes the field purpose obvious.' },
],
},
@@ -207,7 +207,7 @@ export const docsZh = {
],
theming: {
targets: [
- {className: 'xds-date-time-picker', visualProps: ['size', 'status']},
+ {className: 'xds-date-time-input', visualProps: ['size', 'status']},
],
},
};
@@ -216,7 +216,7 @@ export const docsZh = {
export const docsDense = {
description: 'combined date + time picker with calendar popover and time input',
usage: {
- description: 'DateTimePicker combines a calendar popover with a time input for selecting both a date and time. Use for scheduling, events, deadlines, or any form field needing a datetime.',
+ description: 'DateTimeInput combines a calendar popover with a time input for selecting both a date and time. Use for scheduling, events, deadlines, or any form field needing a datetime.',
bestPractices: [
{ guidance: true, description: 'Clear labels + descriptions. Use min/max for valid datetime ranges.' },
{ guidance: true, description: 'Use hasClear for optional datetimes. Choose hour format matching locale.' },
diff --git a/packages/core/src/DateTimePicker/XDSDateTimePicker.test.tsx b/packages/core/src/DateTimeInput/XDSDateTimeInput.test.tsx
similarity index 79%
rename from packages/core/src/DateTimePicker/XDSDateTimePicker.test.tsx
rename to packages/core/src/DateTimeInput/XDSDateTimeInput.test.tsx
index 124c7a0bea..cbbcdba48a 100644
--- a/packages/core/src/DateTimePicker/XDSDateTimePicker.test.tsx
+++ b/packages/core/src/DateTimeInput/XDSDateTimeInput.test.tsx
@@ -1,28 +1,28 @@
// Copyright (c) Meta Platforms, Inc. and affiliates.
/**
- * @file XDSDateTimePicker.test.tsx
- * @input Uses vitest, @testing-library/react, XDSDateTimePicker component
- * @output Unit tests for XDSDateTimePicker component behavior
- * @position Testing; validates XDSDateTimePicker.tsx implementation
+ * @file XDSDateTimeInput.test.tsx
+ * @input Uses vitest, @testing-library/react, XDSDateTimeInput component
+ * @output Unit tests for XDSDateTimeInput component behavior
+ * @position Testing; validates XDSDateTimeInput.tsx implementation
*
- * SYNC: When XDSDateTimePicker.tsx changes, update tests to match new behavior
+ * SYNC: When XDSDateTimeInput.tsx changes, update tests to match new behavior
*/
import {describe, it, expect, vi} from 'vitest';
import {render, screen, fireEvent} from '@testing-library/react';
-import {XDSDateTimePicker} from './XDSDateTimePicker';
-import type {ISODateTimeString} from './XDSDateTimePicker';
+import {XDSDateTimeInput} from './XDSDateTimeInput';
+import type {ISODateTimeString} from './XDSDateTimeInput';
-describe('XDSDateTimePicker', () => {
+describe('XDSDateTimeInput', () => {
it('renders with label', () => {
- render(<XDSDateTimePicker label="Meeting time" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting time" onChange={() => {}} />);
expect(screen.getByLabelText('Meeting time')).toBeInTheDocument();
});
it('renders with placeholder', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Time"
onChange={() => {}}
placeholder="Pick a date"
@@ -32,14 +32,14 @@ describe('XDSDateTimePicker', () => {
});
it('renders both date and time inputs', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).toBeInTheDocument();
expect(screen.getByLabelText('Time')).toBeInTheDocument();
});
it('displays formatted date in date input when value is provided', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={() => {}}
@@ -50,7 +50,7 @@ describe('XDSDateTimePicker', () => {
it('displays formatted time in time input when value is provided (12h)', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={() => {}}
@@ -61,7 +61,7 @@ describe('XDSDateTimePicker', () => {
it('displays formatted time in 24h format', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={() => {}}
@@ -73,7 +73,7 @@ describe('XDSDateTimePicker', () => {
it('displays time with seconds', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Timestamp"
value={'2026-03-15T14:30:45' as ISODateTimeString}
onChange={() => {}}
@@ -85,13 +85,13 @@ describe('XDSDateTimePicker', () => {
it('forwards ref to date input', () => {
const ref = vi.fn();
- render(<XDSDateTimePicker ref={ref} label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput ref={ref} label="Meeting" onChange={() => {}} />);
expect(ref).toHaveBeenCalledWith(expect.any(HTMLInputElement));
});
it('visually hides label when isLabelHidden is true', () => {
render(
- <XDSDateTimePicker label="Meeting" isLabelHidden onChange={() => {}} />,
+ <XDSDateTimeInput label="Meeting" isLabelHidden onChange={() => {}} />,
);
const label = screen.getByText('Meeting');
expect(label).toBeInTheDocument();
@@ -99,9 +99,7 @@ describe('XDSDateTimePicker', () => {
});
it('sets aria-required when isRequired is true', () => {
- render(
- <XDSDateTimePicker label="Meeting" isRequired onChange={() => {}} />,
- );
+ render(<XDSDateTimeInput label="Meeting" isRequired onChange={() => {}} />);
expect(screen.getByRole('combobox')).toHaveAttribute(
'aria-required',
'true',
@@ -109,31 +107,29 @@ describe('XDSDateTimePicker', () => {
});
it('does not set aria-required when isRequired is false', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).not.toHaveAttribute('aria-required');
});
it('sets disabled on both inputs when isDisabled is true', () => {
- render(
- <XDSDateTimePicker label="Meeting" isDisabled onChange={() => {}} />,
- );
+ render(<XDSDateTimeInput label="Meeting" isDisabled onChange={() => {}} />);
expect(screen.getByRole('combobox')).toBeDisabled();
expect(screen.getByLabelText('Time')).toBeDisabled();
});
it('is not disabled by default', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).not.toBeDisabled();
expect(screen.getByLabelText('Time')).not.toBeDisabled();
});
it('date input has role="combobox"', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).toBeInTheDocument();
});
it('date input has aria-haspopup="dialog"', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).toHaveAttribute(
'aria-haspopup',
'dialog',
@@ -141,7 +137,7 @@ describe('XDSDateTimePicker', () => {
});
it('date input has aria-expanded=false by default', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).toHaveAttribute(
'aria-expanded',
'false',
@@ -149,40 +145,38 @@ describe('XDSDateTimePicker', () => {
});
it('calendar button is focusable and clickable', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
const button = screen.getByRole('button', {name: 'Open calendar'});
expect(button).toBeInTheDocument();
expect(button).not.toBeDisabled();
});
it('calendar button is disabled when isDisabled is true', () => {
- render(
- <XDSDateTimePicker label="Meeting" isDisabled onChange={() => {}} />,
- );
+ render(<XDSDateTimeInput label="Meeting" isDisabled onChange={() => {}} />);
const button = screen.getByRole('button', {name: 'Open calendar'});
expect(button).toBeDisabled();
});
it('disables inputs and button when isLoading is true', () => {
- render(<XDSDateTimePicker label="Meeting" isLoading onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" isLoading onChange={() => {}} />);
expect(screen.getByRole('combobox')).toBeDisabled();
expect(screen.getByLabelText('Time')).toBeDisabled();
expect(screen.getByRole('button', {name: 'Open calendar'})).toBeDisabled();
});
it('sets aria-busy when isLoading is true', () => {
- render(<XDSDateTimePicker label="Meeting" isLoading onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" isLoading onChange={() => {}} />);
expect(screen.getByRole('combobox')).toHaveAttribute('aria-busy', 'true');
});
it('does not set aria-busy when not loading', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
expect(screen.getByRole('combobox')).not.toHaveAttribute('aria-busy');
});
it('renders status icon for error status', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
onChange={() => {}}
status={{type: 'error', message: 'Invalid datetime'}}
@@ -196,7 +190,7 @@ describe('XDSDateTimePicker', () => {
it('does not set aria-invalid for warning status', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
onChange={() => {}}
status={{type: 'warning', message: 'Watch out'}}
@@ -207,7 +201,7 @@ describe('XDSDateTimePicker', () => {
it('renders description and links via aria-describedby', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
description="Pick the meeting datetime"
onChange={() => {}}
@@ -220,7 +214,7 @@ describe('XDSDateTimePicker', () => {
it('links status message via aria-describedby', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
onChange={() => {}}
status={{type: 'error', message: 'Invalid datetime'}}
@@ -237,7 +231,7 @@ describe('XDSDateTimePicker', () => {
});
it('handles Escape keydown on date input without error', () => {
- render(<XDSDateTimePicker label="Meeting" onChange={() => {}} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} />);
const input = screen.getByRole('combobox');
fireEvent.keyDown(input, {key: 'Escape'});
});
@@ -246,7 +240,7 @@ describe('XDSDateTimePicker', () => {
it('calls onChange when valid date is typed', () => {
const onChange = vi.fn();
- render(<XDSDateTimePicker label="Meeting" onChange={onChange} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={onChange} />);
const input = screen.getByRole('combobox');
fireEvent.change(input, {target: {value: '03/15/2026'}});
@@ -258,7 +252,7 @@ describe('XDSDateTimePicker', () => {
it('does not call onChange while typing invalid date', () => {
const onChange = vi.fn();
- render(<XDSDateTimePicker label="Meeting" onChange={onChange} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={onChange} />);
const input = screen.getByRole('combobox');
fireEvent.change(input, {target: {value: 'invalid'}});
@@ -269,7 +263,7 @@ describe('XDSDateTimePicker', () => {
it('reverts date input on blur when input is invalid', () => {
const onChange = vi.fn();
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-01-25T10:00' as ISODateTimeString}
onChange={onChange}
@@ -288,7 +282,7 @@ describe('XDSDateTimePicker', () => {
it('does not call onChange for time when no date is set', () => {
const onChange = vi.fn();
- render(<XDSDateTimePicker label="Meeting" onChange={onChange} />);
+ render(<XDSDateTimeInput label="Meeting" onChange={onChange} />);
const timeInput = screen.getByLabelText('Time');
fireEvent.change(timeInput, {target: {value: '3:45 pm'}});
@@ -299,7 +293,7 @@ describe('XDSDateTimePicker', () => {
it('calls onChange for time when date is already set', () => {
const onChange = vi.fn();
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T10:00' as ISODateTimeString}
onChange={onChange}
@@ -315,7 +309,7 @@ describe('XDSDateTimePicker', () => {
describe('hasClear', () => {
it('shows clear button when hasClear is true and value exists', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={() => {}}
@@ -328,9 +322,7 @@ describe('XDSDateTimePicker', () => {
});
it('does not show clear button when value is undefined', () => {
- render(
- <XDSDateTimePicker label="Meeting" onChange={() => {}} hasClear />,
- );
+ render(<XDSDateTimeInput label="Meeting" onChange={() => {}} hasClear />);
expect(
screen.queryByRole('button', {name: 'Clear Meeting'}),
).not.toBeInTheDocument();
@@ -338,7 +330,7 @@ describe('XDSDateTimePicker', () => {
it('does not show clear button when hasClear is false', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={() => {}}
@@ -351,7 +343,7 @@ describe('XDSDateTimePicker', () => {
it('does not show clear button when disabled', () => {
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={() => {}}
@@ -367,7 +359,7 @@ describe('XDSDateTimePicker', () => {
it('calls onChange with undefined when clear is clicked', () => {
const onChange = vi.fn();
render(
- <XDSDateTimePicker
+ <XDSDateTimeInput
label="Meeting"
value={'2026-03-15T14:30' as ISODateTimeString}
onChange={onChange}
diff --git a/packages/core/src/DateTimePicker/XDSDateTimePicker.tsx b/packages/core/src/DateTimeInput/XDSDateTimeInput.tsx
similarity index 95%
rename from packages/core/src/DateTimePicker/XDSDateTimePicker.tsx
rename to packages/core/src/DateTimeInput/XDSDateTimeInput.tsx
index e0f77f8c80..f4333adc64 100644
--- a/packages/core/src/DateTimePicker/XDSDateTimePicker.tsx
+++ b/packages/core/src/DateTimeInput/XDSDateTimeInput.tsx
@@ -3,17 +3,17 @@
'use client';
/**
- * @file XDSDateTimePicker.tsx
+ * @file XDSDateTimeInput.tsx
* @input Uses React, XDSField, XDSCalendar, useXDSPopover, time parsing utilities
- * @output Exports XDSDateTimePicker component, XDSDateTimePickerProps
- * @position Core implementation; consumed by index.ts, tested by XDSDateTimePicker.test.tsx
+ * @output Exports XDSDateTimeInput component, XDSDateTimeInputProps
+ * @position Core implementation; consumed by index.ts, tested by XDSDateTimeInput.test.tsx
*
* SYNC: When modified, update these files to stay in sync:
- * - /packages/core/src/DateTimePicker/DateTimePicker.doc.mjs (props table, features, implementation notes)
- * - /packages/core/src/DateTimePicker/XDSDateTimePicker.test.tsx (tests for new/changed behavior)
- * - /packages/core/src/DateTimePicker/index.ts (exports if types change)
- * - /apps/storybook/stories/DateTimePicker.stories.tsx (storybook stories)
- * - /packages/cli/templates/blocks/components/DateTimePicker/ (showcase blocks)
+ * - /packages/core/src/DateTimeInput/DateTimeInput.doc.mjs (props table, features, implementation notes)
+ * - /packages/core/src/DateTimeInput/XDSDateTimeInput.test.tsx (tests for new/changed behavior)
+ * - /packages/core/src/DateTimeInput/index.ts (exports if types change)
+ * - /apps/storybook/stories/DateTimeInput.stories.tsx (storybook stories)
+ * - /packages/cli/templates/blocks/components/DateTimeInput/ (showcase blocks)
*/
import {
@@ -78,13 +78,13 @@ export type ISODateTimeString = string & {
readonly __brand: 'ISODateTimeString';
};
-export type XDSDateTimePickerHourFormat = '12h' | '24h';
+export type XDSDateTimeInputHourFormat = '12h' | '24h';
-export type XDSDateTimePickerSize = 'sm' | 'md';
+export type XDSDateTimeInputSize = 'sm' | 'md';
export type {
- XDSInputStatus as XDSDateTimePickerStatus,
- XDSInputStatusType as XDSDateTimePickerStatusType,
+ XDSInputStatus as XDSDateTimeInputStatus,
+ XDSInputStatusType as XDSDateTimeInputStatusType,
} from '../Field';
const styles = stylex.create({
@@ -163,7 +163,7 @@ const sizeStyles = stylex.create({
},
});
-export interface XDSDateTimePickerProps extends Omit<
+export interface XDSDateTimeInputProps extends Omit<
XDSBaseProps,
'onChange' | 'defaultValue'
> {
@@ -254,7 +254,7 @@ export interface XDSDateTimePickerProps extends Omit<
* Hour display format.
* @default '12h'
*/
- hourFormat?: XDSDateTimePickerHourFormat;
+ hourFormat?: XDSDateTimeInputHourFormat;
/**
* Time increment in minutes when using arrow keys in the time input.
@@ -278,7 +278,7 @@ export interface XDSDateTimePickerProps extends Omit<
* The size of the inputs.
* @default 'md'
*/
- size?: XDSDateTimePickerSize;
+ size?: XDSDateTimeInputSize;
/**
* Status indicator for the input.
@@ -344,14 +344,14 @@ function getDefaultTime(hasSeconds: boolean): ISOTimeString {
*
* @example
* ```
- * <XDSDateTimePicker
+ * <XDSDateTimeInput
* label="Meeting time"
* value={dateTime}
* onChange={setDateTime}
* />
* ```
*/
-export function XDSDateTimePicker({
+export function XDSDateTimeInput({
label,
isLabelHidden = false,
description,
@@ -379,7 +379,7 @@ export function XDSDateTimePicker({
style,
ref,
...rest
-}: XDSDateTimePickerProps) {
+}: XDSDateTimeInputProps) {
const dateInputId = useId();
const timeInputId = useId();
const descriptionID = useId();
@@ -780,7 +780,7 @@ export function XDSDateTimePicker({
<div
{...rest}
{...mergeProps(
- xdsClassName('date-time-picker', {
+ xdsClassName('date-time-input', {
size,
status: status?.type ?? null,
}),
@@ -800,6 +800,17 @@ export function XDSDateTimePicker({
status && inputStatusHoverShadowStyles[status.type],
status && inputStatusFocusWithinStyles[status.type],
)}>
+ <button
+ type="button"
+ onClick={handleCalendarToggle}
+ disabled={isEffectivelyDisabled}
+ aria-label={popover.isOpen ? 'Close calendar' : 'Open calendar'}
+ {...stylex.props(
+ styles.iconButton,
+ isEffectivelyDisabled && styles.iconButtonDisabled,
+ )}>
+ <XDSIcon icon="calendar" size="sm" color="secondary" />
+ </button>
<input
ref={setDateRefs}
id={dateInputId}
@@ -836,17 +847,6 @@ export function XDSDateTimePicker({
<XDSIcon icon="close" size="sm" color="secondary" />
</button>
)}
- <button
- type="button"
- onClick={handleCalendarToggle}
- disabled={isEffectivelyDisabled}
- aria-label={popover.isOpen ? 'Close calendar' : 'Open calendar'}
- {...stylex.props(
- styles.iconButton,
- isEffectivelyDisabled && styles.iconButtonDisabled,
- )}>
- <XDSIcon icon="calendar" size="sm" color="secondary" />
- </button>
{isBusy && <XDSSpinner size="sm" />}
{status && (
<XDSIcon
@@ -912,4 +912,4 @@ export function XDSDateTimePicker({
);
}
-XDSDateTimePicker.displayName = 'XDSDateTimePicker';
+XDSDateTimeInput.displayName = 'XDSDateTimeInput';
diff --git a/packages/core/src/DateTimeInput/index.ts b/packages/core/src/DateTimeInput/index.ts
new file mode 100644
index 0000000000..72a1ca4ecd
--- /dev/null
+++ b/packages/core/src/DateTimeInput/index.ts
@@ -0,0 +1,20 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+'use client';
+
+/**
+ * @file index.ts
+ * @input DateTimeInput component exports
+ * @output Re-exports XDSDateTimeInput and types
+ * @position Package entry point for DateTimeInput
+ */
+
+export {XDSDateTimeInput} from './XDSDateTimeInput';
+export type {
+ XDSDateTimeInputProps,
+ XDSDateTimeInputSize,
+ XDSDateTimeInputHourFormat,
+ XDSDateTimeInputStatus,
+ XDSDateTimeInputStatusType,
+ ISODateTimeString,
+} from './XDSDateTimeInput';
diff --git a/packages/core/src/DateTimePicker/index.ts b/packages/core/src/DateTimePicker/index.ts
deleted file mode 100644
index 9a172837a2..0000000000
--- a/packages/core/src/DateTimePicker/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
-
-'use client';
-
-/**
- * @file index.ts
- * @input DateTimePicker component exports
- * @output Re-exports XDSDateTimePicker and types
- * @position Package entry point for DateTimePicker
- */
-
-export {XDSDateTimePicker} from './XDSDateTimePicker';
-export type {
- XDSDateTimePickerProps,
- XDSDateTimePickerSize,
- XDSDateTimePickerHourFormat,
- XDSDateTimePickerStatus,
- XDSDateTimePickerStatusType,
- ISODateTimeString,
-} from './XDSDateTimePicker';
diff --git a/packages/core/src/Field/XDSFieldLabel.tsx b/packages/core/src/Field/XDSFieldLabel.tsx
index 4d3014cefb..5167cc16e1 100644
--- a/packages/core/src/Field/XDSFieldLabel.tsx
+++ b/packages/core/src/Field/XDSFieldLabel.tsx
@@ -34,7 +34,7 @@ const styles = stylex.create({
fontFamily: typographyVars['--font-family-body'],
fontSize: typeScaleVars['--text-label-size'],
fontWeight: fontWeightVars['--font-weight-medium'],
- color: colorVars['--color-text-primary'],
+ color: colorVars['--color-text-secondary'],
cursor: 'pointer',
},
labelDisabled: {
diff --git a/packages/core/src/Field/inputStyles.stylex.ts b/packages/core/src/Field/inputStyles.stylex.ts
index e8131f8a5f..3d4f057734 100644
--- a/packages/core/src/Field/inputStyles.stylex.ts
+++ b/packages/core/src/Field/inputStyles.stylex.ts
@@ -57,9 +57,9 @@ export const inputWrapperStyles = stylex.create({
boxShadow: {
default: 'none',
':hover:not(:focus-within)': {
- '@media (hover: hover)': shadowVars['--shadow-inset-hover'],
+ '@media (hover: hover)': `inset 0px 0px 0px 2px color-mix(in srgb, ${colorVars['--color-border-emphasized']} 30%, transparent)`,
},
- ':focus-within': shadowVars['--shadow-inset-selected'],
+ ':focus-within': `inset 0px 0px 0px 2px ${colorVars['--color-accent-muted']}`,
},
outline: 'none',
},
diff --git a/packages/core/src/MultiSelector/XDSMultiSelector.tsx b/packages/core/src/MultiSelector/XDSMultiSelector.tsx
index 051d14238f..0a58a50a7b 100644
--- a/packages/core/src/MultiSelector/XDSMultiSelector.tsx
+++ b/packages/core/src/MultiSelector/XDSMultiSelector.tsx
@@ -27,12 +27,13 @@ import React, {
} from 'react';
import * as stylex from '@stylexjs/stylex';
import {useXDSPopover} from '../Popover/useXDSPopover';
-import {XDSIcon} from '../Icon';
+import {XDSIcon, renderIconSlot, type XDSIconType} from '../Icon';
import type {XDSIconName} from '../Icon';
import {
XDSField,
inputStatusBorderStyles,
inputStatusHoverShadowStyles,
+ inputWrapperStyles,
} from '../Field';
import {XDSDivider} from '../Divider';
import {XDSSpinner} from '../Spinner';
@@ -43,7 +44,6 @@ import {
sizeVars,
spacingVars,
radiusVars,
- shadowVars,
durationVars,
easeVars,
typographyVars,
@@ -81,30 +81,11 @@ const styles = stylex.create({
width: '100%',
paddingBlock: spacingVars['--spacing-2'],
paddingInline: spacingVars['--spacing-3'],
- borderWidth: borderVars['--border-width'],
- borderStyle: 'solid',
- borderColor: {
- default: colorVars['--color-border-emphasized'],
- ':focus-within': colorVars['--color-accent'],
- },
- borderRadius: radiusVars['--radius-element'],
- backgroundColor: colorVars['--color-background-surface'],
fontFamily: typographyVars['--font-family-body'],
fontSize: typeScaleVars['--text-label-size'],
lineHeight: typeScaleVars['--text-label-leading'],
color: colorVars['--color-text-primary'],
cursor: 'pointer',
- transitionProperty: 'border-color, box-shadow',
- transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easeVars['--ease-standard'],
- boxShadow: {
- default: 'none',
- ':hover:not(:focus-within)': {
- '@media (hover: hover)': shadowVars['--shadow-inset-hover'],
- },
- ':focus-within': shadowVars['--shadow-inset-selected'],
- },
- outline: 'none',
},
// Trigger button — the actual combobox button, visually integrated with the container
trigger: {
@@ -133,11 +114,6 @@ const styles = stylex.create({
outlineOffset: '0',
borderRadius: radiusVars['--radius-element'],
},
- triggerDisabled: {
- cursor: 'not-allowed',
- opacity: 0.5,
- borderColor: colorVars['--color-border-emphasized'],
- },
triggerPlaceholder: {
color: colorVars['--color-text-secondary'],
},
@@ -466,6 +442,11 @@ export interface XDSMultiSelectorProps<
*/
labelTooltip?: string;
+ /**
+ * Icon displayed at the start of the selector trigger.
+ */
+ startIcon?: ReactNode | XDSIconType;
+
/**
* Whether to show a clear button when values are selected.
* When clicked, resets the value to an empty array and returns focus to the trigger.
@@ -563,6 +544,7 @@ export function XDSMultiSelector<T extends XDSMultiSelectorOptionType>({
size = 'md',
status,
labelTooltip,
+ startIcon,
hasClear = false,
hasSelectAll = false,
selectAllLabel = 'Select all',
@@ -1131,9 +1113,10 @@ export function XDSMultiSelector<T extends XDSMultiSelectorOptionType>({
{...mergeProps(
xdsClassName('multi-selector', {size, status: status?.type ?? null}),
stylex.props(
+ inputWrapperStyles.base,
styles.triggerContainer,
sizeStyles[size],
- isDisabled && styles.triggerDisabled,
+ isDisabled && inputWrapperStyles.disabled,
optimisticValue.length === 0 && styles.triggerPlaceholder,
status && inputStatusBorderStyles[status.type],
status && inputStatusHoverShadowStyles[status.type],
@@ -1142,6 +1125,8 @@ export function XDSMultiSelector<T extends XDSMultiSelectorOptionType>({
className,
style,
)}>
+ {startIcon &&
+ renderIconSlot(startIcon, {size: 'sm', color: 'secondary'})}
<button
ref={triggerRef}
id={triggerId}
diff --git a/packages/core/src/Selector/XDSSelector.tsx b/packages/core/src/Selector/XDSSelector.tsx
index 7953231004..54960eaa63 100644
--- a/packages/core/src/Selector/XDSSelector.tsx
+++ b/packages/core/src/Selector/XDSSelector.tsx
@@ -27,12 +27,13 @@ import React, {
} from 'react';
import * as stylex from '@stylexjs/stylex';
import {useXDSPopover} from '../Popover/useXDSPopover';
-import {XDSIcon} from '../Icon';
+import {XDSIcon, renderIconSlot, type XDSIconType} from '../Icon';
import type {XDSIconName} from '../Icon';
import {
XDSField,
inputStatusBorderStyles,
inputStatusHoverShadowStyles,
+ inputWrapperStyles,
} from '../Field';
import {XDSDivider} from '../Divider';
import {layerAnimations} from '../Layer/layerAnimations.stylex';
@@ -42,7 +43,6 @@ import {
sizeVars,
spacingVars,
radiusVars,
- shadowVars,
durationVars,
easeVars,
typographyVars,
@@ -75,14 +75,6 @@ const styles = stylex.create({
width: '100%',
paddingBlock: spacingVars['--spacing-2'],
paddingInline: spacingVars['--spacing-3'],
- borderWidth: borderVars['--border-width'],
- borderStyle: 'solid',
- borderColor: {
- default: colorVars['--color-border-emphasized'],
- ':focus-within': colorVars['--color-accent'],
- },
- borderRadius: radiusVars['--radius-element'],
- backgroundColor: colorVars['--color-background-surface'],
fontFamily: typographyVars['--font-family-body'],
fontSize: {
default: typeScaleVars['--text-label-size'],
@@ -91,17 +83,6 @@ const styles = stylex.create({
lineHeight: typeScaleVars['--text-label-leading'],
color: colorVars['--color-text-primary'],
cursor: 'pointer',
- transitionProperty: 'border-color, box-shadow',
- transitionDuration: durationVars['--duration-fast'],
- transitionTimingFunction: easeVars['--ease-standard'],
- boxShadow: {
- default: 'none',
- ':hover:not(:focus-within)': {
- '@media (hover: hover)': shadowVars['--shadow-inset-hover'],
- },
- ':focus-within': shadowVars['--shadow-inset-selected'],
- },
- outline: 'none',
},
// Trigger button — the actual combobox button, visually integrated with the container
trigger: {
@@ -130,11 +111,6 @@ const styles = stylex.create({
outlineOffset: '0',
borderRadius: radiusVars['--radius-element'],
},
- triggerDisabled: {
- cursor: 'not-allowed',
- opacity: 0.5,
- borderColor: colorVars['--color-border-emphasized'],
- },
triggerPlaceholder: {
color: colorVars['--color-text-secondary'],
},
@@ -432,6 +408,11 @@ interface XDSSelectorPropsBase<
*/
labelTooltip?: string;
+ /**
+ * Icon displayed at the start of the selector trigger.
+ */
+ startIcon?: ReactNode | XDSIconType;
+
/**
* Custom render function for options.
* Only called for selectable options (not dividers/sections).
@@ -540,6 +521,7 @@ export function XDSSelector<T extends XDSSelectorOptionType>(
size: sizeProp,
status,
labelTooltip,
+ startIcon,
children,
hasSearch = false,
searchPlaceholder = 'Search...',
@@ -863,9 +845,10 @@ export function XDSSelector<T extends XDSSelectorOptionType>(
{...mergeProps(
xdsClassName('selector', {size, status: status?.type ?? null}),
stylex.props(
+ inputWrapperStyles.base,
styles.triggerContainer,
sizeStyles[size],
- isDisabled && styles.triggerDisabled,
+ isDisabled && inputWrapperStyles.disabled,
!selectedItem && styles.triggerPlaceholder,
status && inputStatusBorderStyles[status.type],
status && inputStatusHoverShadowStyles[status.type],
@@ -874,6 +857,8 @@ export function XDSSelector<T extends XDSSelectorOptionType>(
className,
style,
)}>
+ {startIcon &&
+ renderIconSlot(startIcon, {size: 'sm', color: 'secondary'})}
<button
ref={triggerRef}
id={triggerId}
diff --git a/packages/core/src/TextArea/XDSTextArea.tsx b/packages/core/src/TextArea/XDSTextArea.tsx
index 2c8303e07d..78adb9d5ef 100644
--- a/packages/core/src/TextArea/XDSTextArea.tsx
+++ b/packages/core/src/TextArea/XDSTextArea.tsx
@@ -54,7 +54,7 @@ const styles = stylex.create({
wrapper: {
zIndex: 1,
alignItems: 'flex-start',
- paddingBlock: spacingVars['--spacing-2'],
+ paddingBlock: spacingVars['--spacing-1'],
},
textarea: {
display: 'block',
diff --git a/packages/core/src/Tokenizer/XDSTokenizer.tsx b/packages/core/src/Tokenizer/XDSTokenizer.tsx
index f5c715333a..9087315e72 100644
--- a/packages/core/src/Tokenizer/XDSTokenizer.tsx
+++ b/packages/core/src/Tokenizer/XDSTokenizer.tsx
@@ -205,6 +205,7 @@ export interface XDSTokenizerProps<T extends XDSSearchableItem> {
const styles = stylex.create({
wrapper: {
+ position: 'relative',
flexWrap: 'wrap',
gap: spacingVars['--spacing-1'],
cursor: 'text',
@@ -220,6 +221,11 @@ const styles = stylex.create({
// Row gap must match paddingBlock so wrapped rows look evenly spaced.
rowGap: `calc(${spacingVars['--spacing-1']} - 1px)`,
},
+ startIconWithTokens: {
+ // Restore the default 8px inline-start inset when tokens are present,
+ // since wrapperWithTokens reduces padding to 3px for border concentricity.
+ marginInlineStart: `calc(${spacingVars['--spacing-2']} - ${spacingVars['--spacing-1']} + 1px)`,
+ },
token: {
display: 'flex',
flexShrink: 0,
@@ -242,11 +248,20 @@ const styles = stylex.create({
flexShrink: 0,
},
endSection: {
+ position: 'absolute',
+ top: 0,
+ insetInlineEnd: 0,
display: 'flex',
alignItems: 'center',
gap: spacingVars['--spacing-1'],
- marginInlineStart: 'auto',
flexShrink: 0,
+ paddingInlineEnd: spacingVars['--spacing-2'],
+ },
+ endSectionSm: {
+ height: sizeVars['--size-element-sm'],
+ },
+ endSectionMd: {
+ height: sizeVars['--size-element-md'],
},
sizeSm: {
minHeight: sizeVars['--size-element-sm'],
@@ -684,7 +699,11 @@ export function XDSTokenizer<T extends XDSSearchableItem>({
status && inputStatusFocusWithinStyles[status.type],
),
)}>
- {startIcon && renderIconSlot(startIcon, {size: 'sm', color: 'secondary'})}
+ {startIcon && (
+ <span {...stylex.props(value.length > 0 && styles.startIconWithTokens)}>
+ {renderIconSlot(startIcon, {size: 'sm', color: 'secondary'})}
+ </span>
+ )}
{isTruncated ? (
<XDSOverflowList
gap={1}
@@ -727,7 +746,11 @@ export function XDSTokenizer<T extends XDSSearchableItem>({
}
/>
{(endContent || (hasClear && value.length > 0 && !isDisabled)) && (
- <div {...stylex.props(styles.endSection)}>
+ <div
+ {...stylex.props(
+ styles.endSection,
+ size === 'sm' ? styles.endSectionSm : styles.endSectionMd,
+ )}>
{endContent}
{hasClear && value.length > 0 && !isDisabled && (
<button
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 0a4048dae9..171ec5007a 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -53,8 +53,8 @@ export * from './Slider';
export * from './Stack';
export * from './Switch';
export * from './DateInput';
-export * from './DateTimePicker';
-export * from './DateRangePicker';
+export * from './DateTimeInput';
+export * from './DateRangeInput';
export * from './Field';
export * from './FileInput';
export * from './FormLayout';