Skip to content

Commit

Permalink
add window to more utils
Browse files Browse the repository at this point in the history
  • Loading branch information
sangikhan29 committed Jun 21, 2023
1 parent b4f6c31 commit 76540b9
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions __mocks__/genInteractives.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ const interactiveRoles = []
)
.filter((role) => (
!roles.get(role).abstract
&& roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
&& roles.get(role).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
));

const nonInteractiveRoles = roleNames
.filter((role) => (
!roles.get(role).abstract
&& !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget'))
&& !roles.get(role).superClass.some((klasses) => includes(klasses, 'widget', 'window'))

// 'toolbar' does not descend from widget, but it does support
// aria-activedescendant, thus in practice we treat it as a widget.
Expand Down
2 changes: 1 addition & 1 deletion src/util/isInteractiveElement.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const interactiveRoles = new Set(roleKeys
// The `progressbar` is descended from `widget`, but in practice, its
// value is always `readonly`, so we treat it as a non-interactive role.
&& name !== 'progressbar'
&& role.superClass.some((classes) => includes(classes, 'widget'))
&& role.superClass.some((classes) => includes(classes, 'widget', 'window'))
);
}).concat(
// 'toolbar' does not descend from widget, but it does support
Expand Down
2 changes: 1 addition & 1 deletion src/util/isInteractiveRole.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import flatMap from 'array.prototype.flatmap';
const roles = [...rolesMap.keys()];
const interactiveRoles = roles.filter((name) => (
!rolesMap.get(name).abstract
&& rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget', `window`))
&& rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
));

// 'toolbar' does not descend from widget, but it does support
Expand Down
4 changes: 2 additions & 2 deletions src/util/isNonInteractiveElement.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const nonInteractiveRoles = new Set(roleKeys
// This role is meant to have no semantic value.
// @see https://www.w3.org/TR/wai-aria-1.2/#generic
&& name !== 'generic'
&& !role.superClass.some((classes) => includes(classes, 'widget'))
&& !role.superClass.some((classes) => includes(classes, 'widget', 'window'))
);
}).concat(
// The `progressbar` is descended from `widget`, but in practice, its
Expand All @@ -50,7 +50,7 @@ const interactiveRoles = new Set(roleKeys
// This role is meant to have no semantic value.
// @see https://www.w3.org/TR/wai-aria-1.2/#generic
&& name !== 'generic'
&& role.superClass.some((classes) => includes(classes, 'widget'))
&& role.superClass.some((classes) => includes(classes, 'widget', 'window'))
);
}).concat(
// 'toolbar' does not descend from widget, but it does support
Expand Down
2 changes: 1 addition & 1 deletion src/util/isNonInteractiveRole.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import flatMap from 'array.prototype.flatmap';
const roles = [...rolesMap.keys()];
const nonInteractiveRoles = roles.filter((name) => (
!rolesMap.get(name).abstract
&& !rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget'))
&& !rolesMap.get(name).superClass.some((klasses) => includes(klasses, 'widget', 'window'))
));

/**
Expand Down

0 comments on commit 76540b9

Please sign in to comment.