Skip to content

Commit 87fcb50

Browse files
authored
feat: change acccessibilityStates to accessibilityState (#1938)
1 parent 9e2e7f6 commit 87fcb50

28 files changed

+414
-203
lines changed

src/components/BottomNavigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ class BottomNavigation extends React.Component<Props, State> {
865865
: 'button',
866866
accessibilityComponentType: 'button',
867867
accessibilityRole: 'button',
868-
accessibilityStates: ['selected'],
868+
accessibilityState: { selected: true },
869869
style: styles.item,
870870
children: (
871871
<View pointerEvents="none">

src/components/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ class Button extends React.Component<Props, State> {
274274
accessibilityTraits={disabled ? ['button', 'disabled'] : 'button'}
275275
accessibilityComponentType="button"
276276
accessibilityRole="button"
277-
accessibilityStates={disabled ? ['disabled'] : []}
277+
accessibilityState={{ disabled }}
278278
disabled={disabled}
279279
rippleColor={rippleColor}
280280
style={touchableStyle}

src/components/Checkbox/CheckboxAndroid.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class CheckboxAndroid extends React.Component<Props, State> {
135135
accessibilityTraits={disabled ? ['button', 'disabled'] : 'button'}
136136
accessibilityComponentType="button"
137137
accessibilityRole="button"
138-
accessibilityStates={disabled ? ['disabled'] : []}
138+
accessibilityState={{ disabled }}
139139
accessibilityLiveRegion="polite"
140140
style={styles.container}
141141
>

src/components/Checkbox/CheckboxIOS.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class CheckboxIOS extends React.Component<Props> {
8282
accessibilityTraits={disabled ? ['button', 'disabled'] : 'button'}
8383
accessibilityComponentType="button"
8484
accessibilityRole="button"
85-
accessibilityStates={disabled ? ['disabled'] : []}
85+
accessibilityState={{ disabled }}
8686
accessibilityLiveRegion="polite"
8787
style={styles.container}
8888
>

src/components/Chip.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,17 @@ class Chip extends React.Component<Props, State> {
209209
: selectedBackgroundColor;
210210

211211
const accessibilityTraits: AccessibilityTrait[] = ['button'];
212-
const accessibilityState: AccessibilityState = {};
212+
const accessibilityState: AccessibilityState = {
213+
selected,
214+
disabled,
215+
};
213216

214217
if (selected) {
215218
accessibilityTraits.push('selected');
216-
accessibilityState.selected = true;
217219
}
218220

219221
if (disabled) {
220222
accessibilityTraits.push('disabled');
221-
accessibilityState.disabled = true;
222223
}
223224

224225
return (

src/components/Drawer/DrawerItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class DrawerItem extends React.Component<Props> {
107107
accessibilityTraits={active ? ['button', 'selected'] : 'button'}
108108
accessibilityComponentType="button"
109109
accessibilityRole="button"
110-
accessibilityStates={active ? ['selected'] : []}
110+
accessibilityState={{ selected: active }}
111111
accessibilityLabel={accessibilityLabel}
112112
>
113113
<View style={styles.wrapper}>

src/components/FAB/FAB.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class FAB extends React.Component<Props, State> {
207207
accessibilityTraits={disabled ? ['button', 'disabled'] : 'button'}
208208
accessibilityComponentType="button"
209209
accessibilityRole="button"
210-
accessibilityStates={disabled ? ['disabled'] : []}
210+
accessibilityState={{ disabled }}
211211
style={styles.touchable}
212212
testID={testID}
213213
>

src/components/IconButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const IconButton = ({
121121
accessibilityTraits={disabled ? ['button', 'disabled'] : 'button'}
122122
accessibilityComponentType="button"
123123
accessibilityRole="button"
124-
accessibilityStates={disabled ? ['disabled'] : []}
124+
accessibilityState={{ disabled }}
125125
disabled={disabled}
126126
hitSlop={
127127
// @ts-ignore - this should be fixed in react-theme-providersince withTheme() is not forwarding static property types

src/components/RadioButton/RadioButtonAndroid.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class RadioButtonAndroid extends React.Component<Props, State> {
147147
checked ? 'radiobutton_checked' : 'radiobutton_unchecked'
148148
}
149149
accessibilityRole="button"
150-
accessibilityStates={disabled ? ['disabled'] : []}
150+
accessibilityState={{ disabled }}
151151
accessibilityLiveRegion="polite"
152152
style={styles.container}
153153
>

src/components/RadioButton/RadioButtonIOS.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class RadioButtonIOS extends React.Component<Props> {
105105
checked ? 'radiobutton_checked' : 'radiobutton_unchecked'
106106
}
107107
accessibilityRole="button"
108-
accessibilityStates={disabled ? ['disabled'] : []}
108+
accessibilityState={{ disabled }}
109109
accessibilityLiveRegion="polite"
110110
style={styles.container}
111111
>

0 commit comments

Comments
 (0)