Skip to content

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

TypeScript

fix(Item,InputGroup): prevent rest spread from overwriting explicit ARIA props (#3751)

Cindy Zhang360fc9cbb135
diff --git a/packages/core/src/InputGroup/InputGroup.tsx b/packages/core/src/InputGroup/InputGroup.tsx
index f8be3995f7..54cd0af6e6 100644
--- a/packages/core/src/InputGroup/InputGroup.tsx
+++ b/packages/core/src/InputGroup/InputGroup.tsx
@@ -201,11 +201,11 @@ export function InputGroup({
labelTooltip={labelTooltip}>
<div
ref={ref}
+ data-testid={testId}
+ {...rest}
role="group"
aria-labelledby={labelID}
aria-describedby={describedByIDs}
- data-testid={testId}
- {...rest}
{...mergeProps(
themeProps('input-group', {
size,
diff --git a/packages/core/src/Item/Item.tsx b/packages/core/src/Item/Item.tsx
index 11ecda424b..0d7407bddf 100644
--- a/packages/core/src/Item/Item.tsx
+++ b/packages/core/src/Item/Item.tsx
@@ -470,9 +470,9 @@ export function Item({
return (
<Component
ref={ref as React.Ref<never>}
+ {...restProps}
aria-selected={isSelected || undefined}
aria-disabled={isDisabled || undefined}
- {...restProps}
{...mergeProps(
themeProps('item', {density, align}),
stylex.props(