Skip to content

Commit 1955973

Browse files
authored
Merge pull request #339 from A11yance/disclosure
Remove the attribute information from the DisclosureTriangle concept
2 parents a8cccfe + b9b3e54 commit 1955973

File tree

5 files changed

+7
-49
lines changed

5 files changed

+7
-49
lines changed

__tests__/src/AXObjectElementMap-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const entriesList = [
2424
["DetailsRole", [{"name": "details"}]],
2525
["DialogRole", [{"name": "dialog"}]],
2626
["DirectoryRole", [{"name": "dir"}]],
27-
["DisclosureTriangleRole", [{"attributes": [{"name": "open", "value": "open"}], "constraints": ["scoped to a details element"], "name": "summary"}, {"attributes": [{"name": "aria-expanded"}], "constraints": ["scoped to a details element"], "name": "summary"}]],
27+
["DisclosureTriangleRole", [{"constraints": ["scoped to a details element"], "name": "summary"}]],
2828
["DivRole", [{"name": "div"}]],
2929
["EmbeddedObjectRole", [{"name": "embed"}]],
3030
["FigcaptionRole", [{"name": "figcaption"}]],
@@ -152,7 +152,7 @@ describe('AXObjectElementMap', function () {
152152
expect(AXObjectElementMap.get("DetailsRole")).toEqual([{"name": "details"}]);
153153
expect(AXObjectElementMap.get("DialogRole")).toEqual([{"name": "dialog"}]);
154154
expect(AXObjectElementMap.get("DirectoryRole")).toEqual([{"name": "dir"}]);
155-
expect(AXObjectElementMap.get("DisclosureTriangleRole")).toEqual([{"attributes": [{"name": "open", "value": "open"}], "constraints": ["scoped to a details element"], "name": "summary"}, {"attributes": [{"name": "aria-expanded"}], "constraints": ["scoped to a details element"], "name": "summary"}]);
155+
expect(AXObjectElementMap.get("DisclosureTriangleRole")).toEqual([{"constraints": ["scoped to a details element"], "name": "summary"}]);
156156
expect(AXObjectElementMap.get("DivRole")).toEqual([{"name": "div"}]);
157157
expect(AXObjectElementMap.get("EmbeddedObjectRole")).toEqual([{"name": "embed"}]);
158158
expect(AXObjectElementMap.get("FigcaptionRole")).toEqual([{"name": "figcaption"}]);

__tests__/src/AXObjectsMap-test.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

__tests__/src/elementAXObjectMap-test.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ const entriesList = [
2424
[{"name": "details"}, ["DetailsRole"]],
2525
[{"name": "dialog"}, ["DialogRole"]],
2626
[{"name": "dir"}, ["DirectoryRole"]],
27-
[{"attributes": [{"name": "open", "value": "open"}], "constraints": ["scoped to a details element"], "name": "summary"}, ["DisclosureTriangleRole"]],
28-
[{"attributes": [{"name": "aria-expanded"}], "constraints": ["scoped to a details element"], "name": "summary"}, ["DisclosureTriangleRole"]],
27+
[{"constraints": ["scoped to a details element"], "name": "summary"}, ["DisclosureTriangleRole"]],
2928
[{"name": "div"}, ["DivRole"]],
3029
[{"name": "embed"}, ["EmbeddedObjectRole"]],
3130
[{"name": "figcaption"}, ["FigcaptionRole"]],
@@ -85,7 +84,7 @@ describe('elementAXObjectMap', function () {
8584
expect(elementAXObjectMap[Symbol.iterator]).toBeDefined();
8685
});
8786
it('should have a specific length', function () {
88-
expect([...elementAXObjectMap].length).toEqual(71);
87+
expect([...elementAXObjectMap].length).toEqual(70);
8988
});
9089
describe('should support the spread operator', function () {
9190
test.each([...elementAXObjectMap])(`Testing role: '%s' with element %o`, (role, elements) => {
@@ -167,8 +166,7 @@ describe('elementAXObjectMap', function () {
167166
expect(elementAXObjectMap.get({"name": "details"})).toEqual(["DetailsRole"]);
168167
expect(elementAXObjectMap.get({"name": "dialog"})).toEqual(["DialogRole"]);
169168
expect(elementAXObjectMap.get({"name": "dir"})).toEqual(["DirectoryRole"]);
170-
expect(elementAXObjectMap.get({"attributes": [{"name": "open", "value": "open"}], "name": "summary"})).toEqual(["DisclosureTriangleRole"]),
171-
expect(elementAXObjectMap.get({"attributes": [{"name": "aria-expanded"}], "name": "summary"})).toEqual(["DisclosureTriangleRole"]),
169+
expect(elementAXObjectMap.get({"constraints": ["scoped to a details element"], "name": "summary"})).toEqual(["DisclosureTriangleRole"]),
172170
expect(elementAXObjectMap.get({"name": "div"})).toEqual(["DivRole"]);
173171
expect(elementAXObjectMap.get({"name": "embed"})).toEqual(["EmbeddedObjectRole"]);
174172
expect(elementAXObjectMap.get({"name": "figcaption"})).toEqual(["FigcaptionRole"]);

scripts/axmodel.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -390,26 +390,6 @@
390390
{
391391
"module": "HTML",
392392
"concept": {
393-
"attributes": [
394-
{
395-
"name": "open",
396-
"value": "open"
397-
}
398-
],
399-
"constraints": [
400-
"scoped to a details element"
401-
],
402-
"name": "summary"
403-
}
404-
},
405-
{
406-
"module": "HTML",
407-
"concept": {
408-
"attributes": [
409-
{
410-
"name": "aria-expanded"
411-
}
412-
],
413393
"constraints": [
414394
"scoped to a details element"
415395
],

src/etc/objects/DisclosureTriangleRole.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,6 @@ const DisclosureTriangleRole: AXObjectModelDefinition = {
66
{
77
module: 'HTML',
88
concept: {
9-
attributes: [
10-
{
11-
name: 'open',
12-
value: 'open',
13-
},
14-
],
15-
constraints: [
16-
'scoped to a details element',
17-
],
18-
name: 'summary',
19-
},
20-
},
21-
{
22-
module: 'HTML',
23-
concept: {
24-
attributes: [
25-
{
26-
name: 'aria-expanded',
27-
},
28-
],
299
constraints: [
3010
'scoped to a details element',
3111
],

0 commit comments

Comments
 (0)