Skip to content

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

TypeScript

fix(InputGroup): propagate disabled state to inputs and addons (#8414)

zakelstorm6b46afaa9ed0
diff --git a/.changeset/ast-085-inputgroup.md b/.changeset/ast-085-inputgroup.md
new file mode 100644
index 0000000000..c4f4e46780
--- /dev/null
+++ b/.changeset/ast-085-inputgroup.md
@@ -0,0 +1,6 @@
+---
+'@astryxdesign/core': patch
+---
+
+[fix] Propagate InputGroup disablement to compatible inputs and Button addons so child editing, opening, and form participation use their disabled behavior. Preserve nested group disablement and explicitly disabled children without modifying caller-rendered controls.
+@korkt-kim
diff --git a/apps/storybook/stories/InputGroup.stories.tsx b/apps/storybook/stories/InputGroup.stories.tsx
index 2ee724a15b..c2b83b80f8 100644
--- a/apps/storybook/stories/InputGroup.stories.tsx
+++ b/apps/storybook/stories/InputGroup.stories.tsx
@@ -328,6 +328,29 @@ export const ActionButtonCombinations: Story = {
},
};
+export const Disabled: Story = {
+ render: args => {
+ const [value, setValue] = useState('example');
+ return (
+ <InputGroup {...args}>
+ <TextInput
+ label="URL"
+ value={value}
+ onChange={setValue}
+ htmlName="website"
+ disabledMessage="Website editing is unavailable"
+ />
+ <Button label="Clear" onClick={() => setValue('')} />
+ </InputGroup>
+ );
+ },
+ args: {
+ label: 'Website',
+ description: 'The input and action inherit the group disabled state.',
+ isDisabled: true,
+ },
+};
+
export const WithMultiSelector: Story = {
render: args => {
const [value, setValue] = useState<string[]>([]);
diff --git a/packages/core/src/Button/Button.tsx b/packages/core/src/Button/Button.tsx
index 301bec0d98..7a5211fe76 100644
--- a/packages/core/src/Button/Button.tsx
+++ b/packages/core/src/Button/Button.tsx
@@ -19,6 +19,7 @@
*/
import {
+ use,
useEffect,
useRef,
useState,
@@ -51,6 +52,7 @@ import {EDGE_COMP_ATTR} from '../Layout/edgeCompensation.stylex';
import {useSize} from '../SizeContext/SizeContext';
import {useButtonGroup} from '../ButtonGroup/ButtonGroupContext';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import {groupStyles as inputGroupStyles} from '../InputGroup/groupStyles';
import {mergeProps} from '../utils';
import {useMergedRefs} from '../hooks/useMergedRefs';
@@ -615,7 +617,9 @@ export function Button({
// the consumer is deliberately showing it.
const delaySpinner = isPending || isInterruptible;
const groupDisabled = buttonGroup?.isDisabled ?? false;
- const isTrueDisabled = isDisabled || groupDisabled;
+ const inputGroupState = use(InputGroupInternalContext);
+ const isTrueDisabled =
+ isDisabled || groupDisabled || inputGroupState.isDisabled;
// Busy-only: the button can't fire again purely because an action is in
// flight, not because it's genuinely isDisabled/group-disabled. Per the API
// Conventions "Disabled vs Busy" rule, busy is visual-only (aria-busy +
diff --git a/packages/core/src/DateInput/DateInput.tsx b/packages/core/src/DateInput/DateInput.tsx
index 914a2c9ca3..f7969f2d47 100644
--- a/packages/core/src/DateInput/DateInput.tsx
+++ b/packages/core/src/DateInput/DateInput.tsx
@@ -17,6 +17,7 @@
*/
import {
+ use,
useId,
useState,
useCallback,
@@ -45,6 +46,7 @@ import {
import {Icon} from '../Icon';
import {VisuallyHidden} from '../VisuallyHidden';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import {groupStyles} from '../InputGroup/groupStyles';
import {useSize} from '../SizeContext/SizeContext';
import {Spinner} from '../Spinner';
@@ -1045,6 +1047,8 @@ PointerDateField.displayName = 'PointerDateField';
* ```
*/
export function DateInput(props: DateInputProps) {
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = props.isDisabled || inputGroupState.isDisabled;
const isTouch = useMediaQuery(TOUCH_POINTER_QUERY);
useDevWarning(
'DateInput',
@@ -1062,11 +1066,11 @@ export function DateInput(props: DateInputProps) {
} = props;
switch (surface) {
case 'native':
- return <NativeDateField {...rest} />;
+ return <NativeDateField {...rest} isDisabled={isDisabled} />;
case 'sheet':
- return <TouchDateField {...rest} />;
+ return <TouchDateField {...rest} isDisabled={isDisabled} />;
case 'desktop':
- return <PointerDateField {...rest} />;
+ return <PointerDateField {...rest} isDisabled={isDisabled} />;
}
}
diff --git a/packages/core/src/InputGroup/InputGroup.test.tsx b/packages/core/src/InputGroup/InputGroup.test.tsx
index 9270994b72..78bcb46f7b 100644
--- a/packages/core/src/InputGroup/InputGroup.test.tsx
+++ b/packages/core/src/InputGroup/InputGroup.test.tsx
@@ -20,6 +20,8 @@ import {Typeahead} from '../Typeahead';
import type {SearchableItem, SearchSource} from '../Typeahead';
import {Selector} from '../Selector';
import {MultiSelector} from '../MultiSelector';
+import {TimeInput} from '../TimeInput';
+import {Button} from '../Button';
const fruits: SearchableItem[] = [
{id: '1', label: 'Apple'},
@@ -276,6 +278,124 @@ describe('InputGroup', () => {
).toHaveAttribute('aria-expanded', 'false');
});
+ it('propagates disabled state to all compatible inputs and Button addons', () => {
+ const onChange = () => {};
+ render(
+ <>
+ <InputGroup label="Group" isDisabled>
+ <TextInput label="Text" value="" onChange={onChange} />
+ <Button label="Save" tooltip="Save" />
+ </InputGroup>
+ <InputGroup label="Group" isDisabled>
+ <NumberInput label="Amount" value={2} onChange={onChange} />
+ </InputGroup>
+ <InputGroup label="Group" isDisabled>
+ <Selector label="Single fruit" options={['Apple', 'Banana']} />
+ </InputGroup>
+ <InputGroup label="Group" isDisabled>
+ <MultiSelector
+ label="Multiple fruits"
+ options={['Apple', 'Banana']}
+ value={[]}
+ onChange={onChange}
+ />
+ </InputGroup>
+ <InputGroup label="Group" isDisabled>
+ <DateInput label="Date" presentation="popover" onChange={onChange} />
+ </InputGroup>
+ <InputGroup label="Group" isDisabled>
+ <TimeInput
+ label="Time"
+ presentation="text-input"
+ onChange={onChange}
+ />
+ </InputGroup>
+ <InputGroup label="Group" isDisabled>
+ <Typeahead
+ label="Fruit"
+ value={null}
+ searchSource={fruitSource}
+ onChange={onChange}
+ disabledMessage="Unavailable"
+ />
+ </InputGroup>
+ </>,
+ );
+
+ for (const group of screen.getAllByRole('group', {name: 'Group'})) {
+ expect(group).toHaveAttribute('aria-disabled', 'true');
+ }
+ for (const name of [
+ 'Group Text',
+ 'Group Amount',
+ 'Group Single fruit',
+ 'Group Multiple fruits',
+ 'Group Date',
+ 'Group Time',
+ 'Group Fruit',
+ ]) {
+ expect(screen.getByLabelText(name)).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ }
+ expect(screen.getByRole('button', {name: 'Save'})).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ });
+
+ it('does not let nested groups or children opt out of ancestor disablement', () => {
+ render(
+ <InputGroup label="Outer" isDisabled>
+ <InputGroup label="Inner" isDisabled={false}>
+ <TextInput
+ label="Text"
+ value=""
+ isDisabled={false}
+ onChange={() => {}}
+ />
+ </InputGroup>
+ </InputGroup>,
+ );
+
+ expect(screen.getByRole('group', {name: 'Inner'})).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ expect(screen.getByRole('textbox', {name: 'Inner Text'})).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+ });
+
+ it('re-enables inherited children without re-enabling explicitly disabled children', () => {
+ function Example({disabled}: {disabled: boolean}) {
+ return (
+ <InputGroup label="Group" isDisabled={disabled}>
+ <TextInput label="Text" value="" onChange={() => {}} />
+ <TextInput label="Explicit" value="" isDisabled />
+ </InputGroup>
+ );
+ }
+ const {rerender} = render(<Example disabled />);
+ expect(screen.getByRole('textbox', {name: 'Group Text'})).toHaveAttribute(
+ 'aria-disabled',
+ 'true',
+ );
+
+ rerender(<Example disabled={false} />);
+ expect(screen.getByRole('group', {name: 'Group'})).not.toHaveAttribute(
+ 'aria-disabled',
+ );
+ expect(
+ screen.getByRole('textbox', {name: 'Group Text'}),
+ ).not.toHaveAttribute('aria-disabled');
+ expect(
+ screen.getByRole('textbox', {name: 'Group Explicit'}),
+ ).toHaveAttribute('aria-disabled', 'true');
+ });
+
it('renders the visible label', () => {
render(
<InputGroup label="Price">
diff --git a/packages/core/src/InputGroup/InputGroup.tsx b/packages/core/src/InputGroup/InputGroup.tsx
index 6a3b877c74..b86a1904d0 100644
--- a/packages/core/src/InputGroup/InputGroup.tsx
+++ b/packages/core/src/InputGroup/InputGroup.tsx
@@ -19,7 +19,7 @@
* - /packages/cli/assets/templates/blocks/components/InputGroup/
*/
-import {useId, useMemo, type ReactNode} from 'react';
+import {use, useId, useMemo, type ReactNode} from 'react';
import * as stylex from '@stylexjs/stylex';
import {sizeVars} from '../theme/tokens.stylex';
import {Field, type InputStatus} from '../Field';
@@ -27,6 +27,7 @@ import {SizeProvider, useSize} from '../SizeContext/SizeContext';
import {mergeProps} from '../utils';
import type {BaseProps} from '../BaseProps';
import {InputGroupContext} from './InputGroupContext';
+import {InputGroupInternalContext} from './InputGroupInternalContext';
import {themeProps} from '../utils/themeProps';
export type InputGroupSize = 'sm' | 'md' | 'lg';
@@ -140,7 +141,7 @@ export function InputGroup({
label,
isLabelHidden = false,
description,
- isDisabled = false,
+ isDisabled: isDisabledProp = false,
isOptional = false,
isRequired = false,
size: sizeProp,
@@ -153,6 +154,8 @@ export function InputGroup({
'data-testid': testId,
...rest
}: InputGroupProps) {
+ const parentGroup = use(InputGroupInternalContext);
+ const isDisabled = isDisabledProp || parentGroup.isDisabled;
const size = useSize(sizeProp, 'md');
const inputId = useId();
const labelID = useId();
@@ -171,58 +174,62 @@ export function InputGroup({
() => ({isInGroup: true as const, labelID, describedByIDs}),
[labelID, describedByIDs],
);
+ const internalContextValue = useMemo(() => ({isDisabled}), [isDisabled]);
return (
- <InputGroupContext value={contextValue}>
- <SizeProvider value={size}>
- <Field
- label={label}
- isLabelHidden={isLabelHidden}
- description={description}
- inputID={inputId}
- labelID={labelID}
- descriptionID={description ? descriptionID : undefined}
- isGroupLabel
- isOptional={isOptional}
- isRequired={isRequired}
- isDisabled={isDisabled}
- status={
- status
- ? {
- type: status.type,
- message: status.message,
- messageID: status.message ? statusMessageId : undefined,
- }
- : undefined
- }
- statusVariant="detached"
- labelTooltip={labelTooltip}>
- <div
- ref={ref}
- data-testid={testId}
- {...rest}
- role="group"
- aria-labelledby={labelID}
- aria-describedby={describedByIDs}
- {...mergeProps(
- themeProps('input-group', {
- size,
- status: status?.type ?? null,
- }),
- stylex.props(
- styles.group,
- sizeStyles[size],
- isDisabled && styles.disabled,
- xstyle,
- ),
- className,
- style,
- )}>
- {children}
- </div>
- </Field>
- </SizeProvider>
- </InputGroupContext>
+ <InputGroupInternalContext value={internalContextValue}>
+ <InputGroupContext value={contextValue}>
+ <SizeProvider value={size}>
+ <Field
+ label={label}
+ isLabelHidden={isLabelHidden}
+ description={description}
+ inputID={inputId}
+ labelID={labelID}
+ descriptionID={description ? descriptionID : undefined}
+ isGroupLabel
+ isOptional={isOptional}
+ isRequired={isRequired}
+ isDisabled={isDisabled}
+ status={
+ status
+ ? {
+ type: status.type,
+ message: status.message,
+ messageID: status.message ? statusMessageId : undefined,
+ }
+ : undefined
+ }
+ statusVariant="detached"
+ labelTooltip={labelTooltip}>
+ <div
+ ref={ref}
+ data-testid={testId}
+ {...rest}
+ role="group"
+ aria-disabled={isDisabled || undefined}
+ aria-labelledby={labelID}
+ aria-describedby={describedByIDs}
+ {...mergeProps(
+ themeProps('input-group', {
+ size,
+ status: status?.type ?? null,
+ }),
+ stylex.props(
+ styles.group,
+ sizeStyles[size],
+ isDisabled && styles.disabled,
+ xstyle,
+ ),
+ className,
+ style,
+ )}>
+ {children}
+ </div>
+ </Field>
+ </SizeProvider>
+ </InputGroupContext>
+ </InputGroupInternalContext>
);
}
diff --git a/packages/core/src/InputGroup/InputGroupInternalContext.ts b/packages/core/src/InputGroup/InputGroupInternalContext.ts
new file mode 100644
index 0000000000..5045ad7751
--- /dev/null
+++ b/packages/core/src/InputGroup/InputGroupInternalContext.ts
@@ -0,0 +1,15 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+'use client';
+
+/**
+ * @file InputGroupInternalContext.ts
+ * @input Layer-scoped React context
+ * @output Package-private InputGroup state context
+ * @position Internal group state; not re-exported by index.ts
+ */
+
+import {createLayerScopedContext as createContext} from '../Layer/layerScopedContext';
+
+export const InputGroupInternalContext = createContext({isDisabled: false});
+InputGroupInternalContext.displayName = 'InputGroupInternalContext';
diff --git a/packages/core/src/MultiSelector/MultiSelector.tsx b/packages/core/src/MultiSelector/MultiSelector.tsx
index bffc2774c3..b99b3b94b9 100644
--- a/packages/core/src/MultiSelector/MultiSelector.tsx
+++ b/packages/core/src/MultiSelector/MultiSelector.tsx
@@ -18,6 +18,7 @@
*/
import React, {
+ use,
useCallback,
useEffect,
useId,
@@ -101,6 +102,7 @@ import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';
import {usePressFeedback} from '../hooks/usePressFeedback';
import {groupStyles} from '../InputGroup/groupStyles';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import {VisuallyHidden} from '../VisuallyHidden';
import {useTranslator} from '../i18n';
import type {AdaptivePresentation} from '../hooks/useAdaptivePresentation';
@@ -1087,7 +1089,7 @@ export function MultiSelector<T extends MultiSelectorOptionType>({
description,
isOptional = false,
isRequired = false,
- isDisabled = false,
+ isDisabled: isDisabledProp = false,
isReadOnly = false,
disabledMessage,
options,
@@ -1136,6 +1138,9 @@ export function MultiSelector<T extends MultiSelectorOptionType>({
'aria-describedby': ariaDescribedByProp,
...restProps
}: MultiSelectorProps<T>) {
+ const inputGroup = useInputGroup();
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = isDisabledProp || inputGroupState.isDisabled;
const {rest, container} = useFieldInputStyling('MultiSelector', restProps, {
containerXstyle,
containerClassName,
@@ -1187,7 +1192,6 @@ export function MultiSelector<T extends MultiSelectorOptionType>({
const triggerButtonRef = useMergedRefs<HTMLElement>(triggerRef, ref);
const searchRef = useRef<HTMLInputElement>(null);
const listboxRef = useRef<HTMLDivElement>(null);
- const inputGroup = useInputGroup();
const [searchQuery, setSearchQuery] = useState('');
// A typed query shows the search row's clear (✕) button, which becomes
diff --git a/packages/core/src/NumberInput/NumberInput.tsx b/packages/core/src/NumberInput/NumberInput.tsx
index 49d40b1710..ff52c470e7 100644
--- a/packages/core/src/NumberInput/NumberInput.tsx
+++ b/packages/core/src/NumberInput/NumberInput.tsx
@@ -19,6 +19,7 @@
*/
import {
+ use,
useId,
useState,
useMemo,
@@ -59,6 +60,7 @@ import {useInputContainer} from '../hooks/useInputContainer';
import {useInputStatusIcon} from '../hooks/useInputStatusIcon';
import {useResolvedRequired} from '../hooks/useResolvedRequired';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
// Public padding tokens for the `number-input` theme target. A theme writes an
// ordinary `padding` (in ANY spelling — the shorthand, `paddingBlock`, or a
@@ -537,7 +539,7 @@ export function NumberInput({
description,
isOptional = false,
isRequired = false,
- isDisabled = false,
+ isDisabled: isDisabledProp = false,
isReadOnly = false,
disabledMessage,
startIcon,
@@ -596,6 +598,8 @@ export function NumberInput({
const inputRef = useRef<HTMLInputElement | null>(null);
const containerRef = useRef<HTMLDivElement | null>(null);
const inputGroup = useInputGroup();
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = isDisabledProp || inputGroupState.isDisabled;
// Pending input while user is typing (null = show formatted value)
const [pendingInput, setPendingInput] = useState<string | null>(null);
diff --git a/packages/core/src/Selector/Selector.tsx b/packages/core/src/Selector/Selector.tsx
index 6e84970591..0e091fba49 100644
--- a/packages/core/src/Selector/Selector.tsx
+++ b/packages/core/src/Selector/Selector.tsx
@@ -20,6 +20,7 @@
*/
import React, {
+ use,
useCallback,
useEffect,
useId,
@@ -95,6 +96,7 @@ import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';
import {usePressFeedback} from '../hooks/usePressFeedback';
import {groupStyles} from '../InputGroup/groupStyles';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import {VisuallyHidden} from '../VisuallyHidden';
import {useTranslator} from '../i18n';
import type {AdaptivePresentation} from '../hooks/useAdaptivePresentation';
@@ -951,7 +953,7 @@ export function Selector<T extends SelectorOptionType>(
description,
isOptional = false,
isRequired = false,
- isDisabled = false,
+ isDisabled: isDisabledProp = false,
isReadOnly = false,
disabledMessage,
options,
@@ -992,6 +994,9 @@ export function Selector<T extends SelectorOptionType>(
id,
...restProps
} = props as SelectorPropsClearable<T>;
+ const inputGroup = useInputGroup();
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = isDisabledProp || inputGroupState.isDisabled;
const {rest, container} = useFieldInputStyling('Selector', restProps, {
containerXstyle,
containerClassName,
@@ -1035,7 +1040,6 @@ export function Selector<T extends SelectorOptionType>(
ref,
);
const searchRef = useRef<HTMLInputElement>(null);
- const inputGroup = useInputGroup();
const [searchQuery, setSearchQuery] = useState('');
// Mirrors searchQuery for the seed path, which runs before focus reaches the
diff --git a/packages/core/src/TextInput/TextInput.tsx b/packages/core/src/TextInput/TextInput.tsx
index 9656e12021..b7d4a108ac 100644
--- a/packages/core/src/TextInput/TextInput.tsx
+++ b/packages/core/src/TextInput/TextInput.tsx
@@ -17,6 +17,7 @@
*/
import {
+ use,
useId,
useOptimistic,
useTransition,
@@ -108,6 +109,7 @@ import {useInputContainer} from '../hooks/useInputContainer';
import {useInputStatusIcon} from '../hooks/useInputStatusIcon';
import {useResolvedRequired} from '../hooks/useResolvedRequired';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import type {BaseProps} from '../BaseProps';
import {
type FieldInputBaseProps,
@@ -297,7 +299,7 @@ export function TextInput({
description,
isOptional = false,
isRequired = false,
- isDisabled = false,
+ isDisabled: isDisabledProp = false,
isReadOnly = false,
disabledMessage,
startIcon,
@@ -327,6 +329,9 @@ export function TextInput({
'aria-describedby': ariaDescribedByProp,
...restProps
}: TextInputProps) {
+ const inputGroup = useInputGroup();
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = isDisabledProp || inputGroupState.isDisabled;
const {rest, container} = useFieldInputStyling('TextInput', restProps, {
containerXstyle,
containerClassName,
@@ -352,7 +357,6 @@ export function TextInput({
const statusMessageID = useId();
const inputRef = useRef<HTMLInputElement | null>(null);
const containerRef = useRef<HTMLDivElement | null>(null);
- const inputGroup = useInputGroup();
const [, startTransition] = useTransition();
const [optimisticValue, setOptimisticValue] = useOptimistic(value);
diff --git a/packages/core/src/TimeInput/TimeInput.tsx b/packages/core/src/TimeInput/TimeInput.tsx
index afa1fee1df..97c166fe46 100644
--- a/packages/core/src/TimeInput/TimeInput.tsx
+++ b/packages/core/src/TimeInput/TimeInput.tsx
@@ -18,6 +18,7 @@
*/
import {
+ use,
useId,
useState,
useCallback,
@@ -76,6 +77,7 @@ import {useMediaQuery} from '../hooks/useMediaQuery';
import {useInputStatusIcon} from '../hooks/useInputStatusIcon';
import {useResolvedRequired} from '../hooks/useResolvedRequired';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import {groupStyles} from '../InputGroup/groupStyles';
import {useTooltip} from '../Tooltip';
import {themeProps} from '../utils/themeProps';
@@ -934,6 +936,8 @@ TimeField.displayName = 'TimeField';
* `preventDefault` on, so it cannot cancel built-in behavior.
*/
export function TimeInput(props: TimeInputProps) {
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = props.isDisabled || inputGroupState.isDisabled;
const isTouch = useMediaQuery(TOUCH_POINTER_QUERY);
useDevWarning(
'TimeInput',
@@ -956,6 +960,7 @@ export function TimeInput(props: TimeInputProps) {
return (
<TimeField
{...rest}
+ isDisabled={isDisabled}
nativeMode={
props.presentation === undefined && props.nativePicker === 'always'
? 'legacy'
@@ -967,12 +972,14 @@ export function TimeInput(props: TimeInputProps) {
switch (resolveInputPresentation(effective, isTouch)) {
case 'native':
// Only `adaptive-native` on a coarse pointer resolves here (FR2).
- return <TimeField {...rest} nativeMode="adaptive" />;
+ return (
+ <TimeField {...rest} isDisabled={isDisabled} nativeMode="adaptive" />
+ );
case 'sheet':
- return <TouchTimeField {...rest} />;
+ return <TouchTimeField {...rest} isDisabled={isDisabled} />;
case 'text-input':
case 'desktop':
- return <TimeField {...rest} />;
+ return <TimeField {...rest} isDisabled={isDisabled} />;
}
}
diff --git a/packages/core/src/Typeahead/Typeahead.tsx b/packages/core/src/Typeahead/Typeahead.tsx
index 9e3254431f..13846f43a1 100644
--- a/packages/core/src/Typeahead/Typeahead.tsx
+++ b/packages/core/src/Typeahead/Typeahead.tsx
@@ -19,6 +19,7 @@
*/
import React, {
+ use,
useCallback,
useId,
useRef,
@@ -55,6 +56,7 @@ import {Spinner} from '../Spinner';
import {spacingVars, sizeVars} from '../theme/tokens.stylex';
import {groupStyles} from '../InputGroup/groupStyles';
import {useInputGroup} from '../InputGroup/InputGroupContext';
+import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';
import {
composeEventHandlers,
getInputARIA,
@@ -396,7 +398,7 @@ export function Typeahead<T extends SearchableItem>({
maxMenuItems,
minQueryLength,
emptySearchText,
- isDisabled = false,
+ isDisabled: isDisabledProp = false,
disabledMessage,
hasClear = true,
hasAutoFocus,
@@ -429,6 +431,8 @@ export function Typeahead<T extends SearchableItem>({
const descriptionId = useId();
const statusMessageId = useId();
const inputGroup = useInputGroup();
+ const inputGroupState = use(InputGroupInternalContext);
+ const isDisabled = isDisabledProp || inputGroupState.isDisabled;
const wrapperRef = useRef<HTMLDivElement>(null);
const inputRef = useRef<HTMLInputElement>(null);