Skip to content

Commit cb83c99

Browse files
sangikhan29ljharb
authored andcommitted
add window to more utils
1 parent 63023ae commit cb83c99

5 files changed

+7
-7
lines changed

__mocks__/genInteractives.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ const interactiveRoles = []
140140
)
141141
.filter((role) => (
142142
!roles.get(role).abstract
143-
&& roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
143+
&& roles.get(role).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
144144
));
145145

146146
const nonInteractiveRoles = roleNames
147147
.filter((role) => (
148148
!roles.get(role).abstract
149-
&& !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
149+
&& !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
150150

151151
// 'toolbar' does not descend from widget, but it does support
152152
// 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
@@ -35,7 +35,7 @@ const nonInteractiveRoles = new Set(roleKeys
3535
// treats them both as CellRole and since gridcell is interactive, we consider
3636
// cell interactive as well.
3737
&& name !== 'cell'
38-
&& !role.superClass.some((classes) => includes(classes, 'widget'))
38+
&& !role.superClass.some((classes) => includes(classes, 'widget', 'window'))
3939
);
4040
}).concat(
4141
// The `progressbar` is descended from `widget`, but in practice, its
@@ -54,7 +54,7 @@ const interactiveRoles = new Set(roleKeys
5454
// This role is meant to have no semantic value.
5555
// @see https://www.w3.org/TR/wai-aria-1.2/#generic
5656
&& name !== 'generic'
57-
&& role.superClass.some((classes) => includes(classes, 'widget'))
57+
&& role.superClass.some((classes) => includes(classes, 'widget', 'window'))
5858
);
5959
}).concat(
6060
// '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)