diff --git a/packages/components/src/components/Button/Button.tsx b/packages/components/src/components/Button/Button.tsx index a1dd811..e555970 100644 --- a/packages/components/src/components/Button/Button.tsx +++ b/packages/components/src/components/Button/Button.tsx @@ -61,8 +61,8 @@ export const Button: FC = ({ disabled={disabled} {...pressableProps} accessibilityState={{ - disabled: disabled ?? false, ...pressableProps.accessibilityState, + disabled: disabled ?? false, }} > {(pressedEvent) => ( diff --git a/packages/components/src/components/Button/IconButton.tsx b/packages/components/src/components/Button/IconButton.tsx index d360d2c..fe9a357 100644 --- a/packages/components/src/components/Button/IconButton.tsx +++ b/packages/components/src/components/Button/IconButton.tsx @@ -41,12 +41,12 @@ export const IconButton: FC = ({ ref={ref} style={styles.container} accessibilityRole={"button"} + disabled={disabled} + {...pressableProps} accessibilityState={{ - disabled: disabled ?? false, ...pressableProps.accessibilityState, + disabled: disabled ?? false, }} - disabled={disabled} - {...pressableProps} > {(pressedEvent) => ( ( onFocus={onFocus} onBlur={onBlur} accessibilityState={{ + ...rest.accessibilityState, disabled, }} style={[ diff --git a/packages/components/src/components/TextArea/TextArea.tsx b/packages/components/src/components/TextArea/TextArea.tsx index 1c6f293..c351588 100644 --- a/packages/components/src/components/TextArea/TextArea.tsx +++ b/packages/components/src/components/TextArea/TextArea.tsx @@ -157,7 +157,7 @@ export const TextArea = ({ .filter(Boolean) .join(". ") || undefined) } - accessibilityState={{ disabled, ...userAccessibilityState }} + accessibilityState={{ ...userAccessibilityState, disabled }} style={[styles.textInput, userStyle]} {...rest} />