Skip to content

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

TypeScript

fix (#999)

Andrey Godercdfb72ac7e7a
diff --git a/apps/storybook/stories/DateInput.stories.tsx b/apps/storybook/stories/DateInput.stories.tsx
index 334946e82d..c5e3d72377 100644
--- a/apps/storybook/stories/DateInput.stories.tsx
+++ b/apps/storybook/stories/DateInput.stories.tsx
@@ -2,6 +2,7 @@ import {useState} from 'react';
import type {Meta, StoryObj} from '@storybook/react';
import {XDSDateInput} from '@xds/core/DateInput';
import type {ISODateString} from '@xds/core/Calendar';
+import {XDSLayout, XDSLayoutContent} from '@xds/core/Layout';
const meta: Meta<typeof XDSDateInput> = {
title: 'Form/XDSDateInput',
@@ -165,6 +166,29 @@ export const WithMinMax: Story = {
},
};
+export const WithMaxDateInLayout: Story = {
+ render: args => {
+ const [value, setValue] = useState<ISODateString | undefined>(undefined);
+ return (
+ <XDSLayout
+ height="auto"
+ content={
+ <XDSLayoutContent>
+ <XDSDateInput {...args} value={value} onChange={setValue} />
+ </XDSLayoutContent>
+ }
+ />
+ );
+ },
+ args: {
+ label: 'End date',
+ max: new Date().toISOString().slice(0, 10) as ISODateString,
+ description:
+ 'Max is today — open the calendar to verify the label does not turn grey when nav buttons are disabled',
+ placeholder: 'Select an end date',
+ },
+};
+
export const TwoMonthCalendar: Story = {
render: args => {
const [value, setValue] = useState<ISODateString | undefined>(undefined);
diff --git a/packages/core/src/DateInput/XDSDateInput.tsx b/packages/core/src/DateInput/XDSDateInput.tsx
index d5001edc45..cd3b42b67a 100644
--- a/packages/core/src/DateInput/XDSDateInput.tsx
+++ b/packages/core/src/DateInput/XDSDateInput.tsx
@@ -464,6 +464,7 @@ export function XDSDateInput({
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/Field/XDSField.tsx b/packages/core/src/Field/XDSField.tsx
index d2a6ed861f..4468c193cb 100644
--- a/packages/core/src/Field/XDSField.tsx
+++ b/packages/core/src/Field/XDSField.tsx
@@ -121,6 +121,11 @@ export interface XDSFieldProps extends Omit<
* @default false
*/
isRequired?: boolean;
+ /**
+ * Whether the associated input is disabled.
+ * @default false
+ */
+ isDisabled?: boolean;
/**
* Icon to display before the label text.
*/
@@ -188,6 +193,7 @@ export function XDSField({
descriptionID,
isOptional = false,
isRequired = false,
+ isDisabled = false,
labelIcon,
status,
labelTooltip,
@@ -225,6 +231,7 @@ export function XDSField({
label={label}
inputID={inputID}
isLabelHidden={isLabelHidden}
+ isDisabled={isDisabled}
isOptional={isOptional}
isRequired={isRequired}
labelIcon={labelIcon}
diff --git a/packages/core/src/Field/XDSFieldLabel.tsx b/packages/core/src/Field/XDSFieldLabel.tsx
index 9c78d8e2e3..44704e330c 100644
--- a/packages/core/src/Field/XDSFieldLabel.tsx
+++ b/packages/core/src/Field/XDSFieldLabel.tsx
@@ -30,15 +30,8 @@ const styles = stylex.create({
fontFamily: typographyVars['--font-family-body'],
fontSize: typeScaleVars['--text-label-size'],
fontWeight: fontWeightVars['--font-weight-medium'],
- color: {
- default: colorVars['--color-text-primary'],
- [stylex.when.ancestor(':has(:disabled)')]:
- colorVars['--color-text-disabled'],
- },
- cursor: {
- default: 'pointer',
- [stylex.when.ancestor(':has(:disabled)')]: 'not-allowed',
- },
+ color: colorVars['--color-text-primary'],
+ cursor: 'pointer',
},
labelDisabled: {
color: colorVars['--color-text-disabled'],
diff --git a/packages/core/src/NumberInput/XDSNumberInput.tsx b/packages/core/src/NumberInput/XDSNumberInput.tsx
index 54f1392a9e..fcf99922b5 100644
--- a/packages/core/src/NumberInput/XDSNumberInput.tsx
+++ b/packages/core/src/NumberInput/XDSNumberInput.tsx
@@ -444,6 +444,7 @@ export function XDSNumberInput({
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
labelIcon={labelIcon}
status={
status
diff --git a/packages/core/src/RadioList/XDSRadioList.tsx b/packages/core/src/RadioList/XDSRadioList.tsx
index 6868d35575..79ceb31691 100644
--- a/packages/core/src/RadioList/XDSRadioList.tsx
+++ b/packages/core/src/RadioList/XDSRadioList.tsx
@@ -201,6 +201,7 @@ export function XDSRadioList({
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/Selector/XDSSelector.tsx b/packages/core/src/Selector/XDSSelector.tsx
index 636226d1dc..2cd74331b2 100644
--- a/packages/core/src/Selector/XDSSelector.tsx
+++ b/packages/core/src/Selector/XDSSelector.tsx
@@ -577,6 +577,7 @@ export function XDSSelector<T extends XDSSelectorOptionType>({
descriptionID={description ? descriptionId : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/Slider/XDSSlider.tsx b/packages/core/src/Slider/XDSSlider.tsx
index 720e036688..da43f20455 100644
--- a/packages/core/src/Slider/XDSSlider.tsx
+++ b/packages/core/src/Slider/XDSSlider.tsx
@@ -708,6 +708,7 @@ export function XDSSlider({ref, ...props}: XDSSliderProps) {
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/TextArea/XDSTextArea.tsx b/packages/core/src/TextArea/XDSTextArea.tsx
index 771de59f63..cf6cbe694d 100644
--- a/packages/core/src/TextArea/XDSTextArea.tsx
+++ b/packages/core/src/TextArea/XDSTextArea.tsx
@@ -339,6 +339,7 @@ export function XDSTextArea({
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/TextInput/XDSTextInput.tsx b/packages/core/src/TextInput/XDSTextInput.tsx
index 591feff119..9029497c09 100644
--- a/packages/core/src/TextInput/XDSTextInput.tsx
+++ b/packages/core/src/TextInput/XDSTextInput.tsx
@@ -261,6 +261,7 @@ export function XDSTextInput({
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/TimeInput/XDSTimeInput.tsx b/packages/core/src/TimeInput/XDSTimeInput.tsx
index 657d86051e..56591cb3ae 100644
--- a/packages/core/src/TimeInput/XDSTimeInput.tsx
+++ b/packages/core/src/TimeInput/XDSTimeInput.tsx
@@ -486,6 +486,7 @@ export function XDSTimeInput({
descriptionID={description ? descriptionID : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/Tokenizer/XDSTokenizer.tsx b/packages/core/src/Tokenizer/XDSTokenizer.tsx
index 763e5f3c3c..3f7bca5738 100644
--- a/packages/core/src/Tokenizer/XDSTokenizer.tsx
+++ b/packages/core/src/Tokenizer/XDSTokenizer.tsx
@@ -526,6 +526,7 @@ export function XDSTokenizer<T extends XDSSearchableItem>({
descriptionID={description ? descriptionId : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {
diff --git a/packages/core/src/Typeahead/XDSTypeahead.tsx b/packages/core/src/Typeahead/XDSTypeahead.tsx
index 3e24d95c40..9af15bfe41 100644
--- a/packages/core/src/Typeahead/XDSTypeahead.tsx
+++ b/packages/core/src/Typeahead/XDSTypeahead.tsx
@@ -358,6 +358,7 @@ export function XDSTypeahead<T extends XDSSearchableItem>({
descriptionID={description ? descriptionId : undefined}
isOptional={isOptional}
isRequired={isRequired}
+ isDisabled={isDisabled}
status={
status
? {