Skip to content

Commit 76540b9

Browse files
committed
add window to more utils
1 parent b4f6c31 commit 76540b9

5 files changed

+7
-7
lines changed

__mocks__/genInteractives.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ const interactiveRoles = []
136136
)
137137
.filter((role) => (
138138
!roles.get(role).abstract
139-
&& roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
139+
&& roles.get(role).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
140140
));
141141

142142
const nonInteractiveRoles = roleNames
143143
.filter((role) => (
144144
!roles.get(role).abstract
145-
&& !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
145+
&& !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
146146

147147
// 'toolbar' does not descend from widget, but it does support
148148
// aria-activedescendant, thus in practice we treat it as a widget.

src/util/isInteractiveElement.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const interactiveRoles = new Set(roleKeys
4343
// The `progressbar` is descended from `widget`, but in practice, its
4444
// value is always `readonly`, so we treat it as a non-interactive role.
4545
&& name !== 'progressbar'
46-
&& role.superClass.some((classes) => includes(classes, 'widget'))
46+
&& role.superClass.some((classes) => includes(classes, 'widget', 'window'))
4747
);
4848
}).concat(
4949
// 'toolbar' does not descend from widget, but it does support

src/util/isInteractiveRole.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import flatMap from 'array.prototype.flatmap';
88
const roles = [...rolesMap.keys()];
99
const interactiveRoles = roles.filter((name) => (
1010
!rolesMap.get(name).abstract
11-
&& rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget', `window`))
11+
&& rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
1212
));
1313

1414
// 'toolbar' does not descend from widget, but it does support

src/util/isNonInteractiveElement.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const nonInteractiveRoles = new Set(roleKeys
3131
// This role is meant to have no semantic value.
3232
// @see https://www.w3.org/TR/wai-aria-1.2/#generic
3333
&& name !== 'generic'
34-
&& !role.superClass.some((classes) => includes(classes, 'widget'))
34+
&& !role.superClass.some((classes) => includes(classes, 'widget', 'window'))
3535
);
3636
}).concat(
3737
// The `progressbar` is descended from `widget`, but in practice, its
@@ -50,7 +50,7 @@ const interactiveRoles = new Set(roleKeys
5050
// This role is meant to have no semantic value.
5151
// @see https://www.w3.org/TR/wai-aria-1.2/#generic
5252
&& name !== 'generic'
53-
&& role.superClass.some((classes) => includes(classes, 'widget'))
53+
&& role.superClass.some((classes) => includes(classes, 'widget', 'window'))
5454
);
5555
}).concat(
5656
// 'toolbar' does not descend from widget, but it does support

src/util/isNonInteractiveRole.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import flatMap from 'array.prototype.flatmap';
1414
const roles = [...rolesMap.keys()];
1515
const nonInteractiveRoles = roles.filter((name) => (
1616
!rolesMap.get(name).abstract
17-
&& !rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget'))
17+
&& !rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
1818
));
1919

2020
/**

0 commit comments

Comments
 (0)