Skip to content

Commit 172ab2c

Browse files
committed
refactor: rename isInaccessible
1 parent 860356b commit 172ab2c

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

src/helpers/__tests__/accessiblity.test.tsx

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
import React from 'react';
22
import { View, Text, TextInput } from 'react-native';
3-
import { render, isInaccessible } from '../..';
3+
import { render, isHiddenFromAccessibility } from '../..';
44

55
test('returns false for accessible elements', () => {
66
expect(
7-
isInaccessible(render(<View testID="subject" />).getByTestId('subject'))
7+
isHiddenFromAccessibility(
8+
render(<View testID="subject" />).getByTestId('subject')
9+
)
810
).toBe(false);
911

1012
expect(
11-
isInaccessible(
13+
isHiddenFromAccessibility(
1214
render(<Text testID="subject">Hello</Text>).getByTestId('subject')
1315
)
1416
).toBe(false);
1517

1618
expect(
17-
isInaccessible(
19+
isHiddenFromAccessibility(
1820
render(<TextInput testID="subject" />).getByTestId('subject')
1921
)
2022
).toBe(false);
2123
});
2224

2325
test('detects elements with accessibilityElementsHidden prop', () => {
2426
const view = render(<View testID="subject" accessibilityElementsHidden />);
25-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
27+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
2628
});
2729

2830
test('detects nested elements with accessibilityElementsHidden prop', () => {
@@ -31,7 +33,7 @@ test('detects nested elements with accessibilityElementsHidden prop', () => {
3133
<View testID="subject" />
3234
</View>
3335
);
34-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
36+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
3537
});
3638

3739
test('detects deeply nested elements with accessibilityElementsHidden prop', () => {
@@ -44,14 +46,14 @@ test('detects deeply nested elements with accessibilityElementsHidden prop', ()
4446
</View>
4547
</View>
4648
);
47-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
49+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
4850
});
4951

5052
test('detects elements with importantForAccessibility="no-hide-descendants" prop', () => {
5153
const view = render(
5254
<View testID="subject" importantForAccessibility="no-hide-descendants" />
5355
);
54-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
56+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
5557
});
5658

5759
test('detects nested elements with importantForAccessibility="no-hide-descendants" prop', () => {
@@ -60,12 +62,12 @@ test('detects nested elements with importantForAccessibility="no-hide-descendant
6062
<View testID="subject" />
6163
</View>
6264
);
63-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
65+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
6466
});
6567

6668
test('detects elements with display=none', () => {
6769
const view = render(<View testID="subject" style={{ display: 'none' }} />);
68-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
70+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
6971
});
7072

7173
test('detects nested elements with display=none', () => {
@@ -74,7 +76,7 @@ test('detects nested elements with display=none', () => {
7476
<View testID="subject" />
7577
</View>
7678
);
77-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
79+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
7880
});
7981

8082
test('detects deeply nested elements with display=none', () => {
@@ -87,7 +89,7 @@ test('detects deeply nested elements with display=none', () => {
8789
</View>
8890
</View>
8991
);
90-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
92+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
9193
});
9294

9395
test('detects elements with display=none with complex style', () => {
@@ -97,12 +99,12 @@ test('detects elements with display=none with complex style', () => {
9799
style={[{ display: 'flex' }, [{ display: 'flex' }], { display: 'none' }]}
98100
/>
99101
);
100-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
102+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
101103
});
102104

103105
test('is not trigged by opacity = 0', () => {
104106
const view = render(<View testID="subject" style={{ opacity: 0 }} />);
105-
expect(isInaccessible(view.getByTestId('subject'))).toBe(false);
107+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(false);
106108
});
107109

108110
test('detects siblings of element with accessibilityViewIsModal prop', () => {
@@ -112,7 +114,7 @@ test('detects siblings of element with accessibilityViewIsModal prop', () => {
112114
<View testID="subject" />
113115
</View>
114116
);
115-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
117+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
116118
});
117119

118120
test('detects deeply nested siblings of element with accessibilityViewIsModal prop', () => {
@@ -126,7 +128,7 @@ test('detects deeply nested siblings of element with accessibilityViewIsModal pr
126128
</View>
127129
</View>
128130
);
129-
expect(isInaccessible(view.getByTestId('subject'))).toBe(true);
131+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(true);
130132
});
131133

132134
test('is not triggered for element with accessibilityViewIsModal prop', () => {
@@ -135,7 +137,7 @@ test('is not triggered for element with accessibilityViewIsModal prop', () => {
135137
<View accessibilityViewIsModal testID="subject" />
136138
</View>
137139
);
138-
expect(isInaccessible(view.getByTestId('subject'))).toBe(false);
140+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(false);
139141
});
140142

141143
test('is not triggered for child of element with accessibilityViewIsModal prop', () => {
@@ -146,7 +148,7 @@ test('is not triggered for child of element with accessibilityViewIsModal prop',
146148
</View>
147149
</View>
148150
);
149-
expect(isInaccessible(view.getByTestId('subject'))).toBe(false);
151+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(false);
150152
});
151153

152154
test('is not triggered for descendent of element with accessibilityViewIsModal prop', () => {
@@ -161,5 +163,5 @@ test('is not triggered for descendent of element with accessibilityViewIsModal p
161163
</View>
162164
</View>
163165
);
164-
expect(isInaccessible(view.getByTestId('subject'))).toBe(false);
166+
expect(isHiddenFromAccessibility(view.getByTestId('subject'))).toBe(false);
165167
});

src/helpers/accessiblity.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const accessibilityStateKeys: AccessibilityStateKey[] = [
1616
'expanded',
1717
];
1818

19-
export function isInaccessible(
19+
export function isHiddenFromAccessibility(
2020
element: ReactTestInstance | null,
2121
{ cache }: IsInaccessibleOptions = {}
2222
): boolean {
@@ -43,9 +43,10 @@ export function isInaccessible(
4343
return false;
4444
}
4545

46-
export function isSubtreeInaccessible(
47-
element: ReactTestInstance | null
48-
): boolean {
46+
/** RTL-compatitibility alias for `isHiddenFromAccessibility` */
47+
export const isInaccessible = isHiddenFromAccessibility;
48+
49+
function isSubtreeInaccessible(element: ReactTestInstance | null): boolean {
4950
if (element == null) {
5051
return true;
5152
}

src/pure.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ import { within, getQueriesForElement } from './within';
88
import { getDefaultNormalizer } from './matches';
99
import { renderHook } from './renderHook';
1010
import { screen } from './screen';
11-
import { isInaccessible } from './helpers/accessiblity';
11+
export {
12+
isHiddenFromAccessibility,
13+
isInaccessible,
14+
} from './helpers/accessiblity';
1215

1316
export type {
1417
RenderOptions,
@@ -29,4 +32,3 @@ export { within, getQueriesForElement };
2932
export { getDefaultNormalizer };
3033
export { renderHook };
3134
export { screen };
32-
export { isInaccessible };

0 commit comments

Comments
 (0)