Skip to content

Commit

Permalink
Merge branch 'main' into popover-states-clarification
Browse files Browse the repository at this point in the history
  • Loading branch information
@scottaohara
scottaohara authored Jan 10, 2025
2 parents 9052224 + 56bc62f commit fa0b411
Show file tree
Hide file tree
Showing 25 changed files with 2,168 additions and 163 deletions.
4 changes: 3 additions & 1 deletion .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ Closes #????

Describe Change Here!

<!--- IF EDITORIAL or CHORE, delete the rest of this template -->
And a few other todo items (delete this section after performing them):
* [ ] For every spec that this PR edits, please add the appropriate `spec:<spec_name>` label. If you don't have privileges to do this, editors will do it for you.
* [ ] If the change is [editorial](https://github.com/w3c/aria/blob/main/documentation/process.md#editorial-changes), please add "Editorial:" at the start of your PR name, and delete the "Test, Documentation and Implementation tracking" section below.

# Test, Documentation and Implementation tracking
Once this PR has been reviewed and has consensus from the working group, tests should be written and issues should be opened on browsers. Add N/A and check when not applicable.
Expand Down
13 changes: 11 additions & 2 deletions accname/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<script src="../common/script/resolveReferences.js" class="remove"></script>
<script src="../common/script/utility.js" class="remove"></script>
<script src="../common/biblio.js" class="remove" defer="defer"></script>
<script src="../common/script/participants.js" class="remove"></script>
<script class="remove">
var respecConfig = {
github: "w3c/accname",
Expand Down Expand Up @@ -131,7 +132,7 @@
REC: "https://www.w3.org/WAI/ARIA/apg/",
},

preProcess: [linkCrossReferences],
preProcess: [linkCrossReferences, getParticipants],
postProcess: [addPlatformMaintainers],
//Pointing to the 1.2 versions but should remove the version in the publishing branch
xref: ["dom", "core-aam-1.2", "wai-aria-1.2", "infra"],
Expand Down Expand Up @@ -784,7 +785,15 @@ <h2>Substantive changes since the <a href="https://www.w3.org/TR/accname-1.1/">A
<section class="appendix informative section" id="acknowledgements">
<h3>Acknowledgments</h3>
<p>The following people contributed to the development of this document.</p>
<div data-include="../common/acknowledgements/aria-wg-active.html" data-include-replace="true"></div>
<ul id="gh-contributors">
<!-- GitHub contributors go here -->
</ul>
<section class="section" id="ack_group">
<h4>ARIA WG participants at the time of publication</h4>
<ul>
<!-- List of participants is injected here -->
</ul>
</section>
<div data-include="../common/acknowledgements/funders.html" data-include-replace="true"></div>
</section>
</section>
Expand Down
55 changes: 13 additions & 42 deletions common/script/participants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,19 @@ function getParticipants() {
// Define the ID of the list element where the user information will be inserted
const LIST_ID = "ack_group";

/**
* Fetches users and their affiliations from the API and returns an array of user information.
* Each element in the array is an object containing the user's title and affiliation.
*
* @async
* @function getUsersInfo
* @returns {Promise<Array<{title: string, affiliation: string}>>} - A promise that resolves to an array of user information.
*/
async function getUsersInfo() {
// Send a GET request to the users endpoint
const response = await fetch(`${BASE_URL}/users`);
// Fetch the JSON data from the response
const data = await response.json();
// Extract the list of users
const users = data._links.users;

// Initialize an empty array to store user information
let usersInfo = [];
// Iterate over each user
for (const user of users) {
// Fetch the affiliation of the current user

const usersInfo = await Promise.all(users.map(async (user) => {
const affiliation = await getAffiliation(user);
// Push an object containing the user's title and affiliation to the usersInfo array
usersInfo.push({ title: user.title, affiliation: affiliation });
}
// Return the array containing information of all users
return { title: user.title, affiliation: affiliation };
}));

return usersInfo;
}

/**
* Fetches the affiliation of a given user from the API.
*
* @async
* @function getAffiliation
* @param {Object} user - The user object.
* @returns {Promise<string>} - A promise that resolves to the title of the user's affiliation.
*/

async function getAffiliation(user) {
// Send a GET request to the affiliations endpoint of the user
const response = await fetch(user.href + "/affiliations/");
Expand All @@ -58,23 +34,18 @@ function getParticipants() {
// Return the title of the affiliation
return affiliation;
}

/**
* Fetches users and their affiliations, creates a list item for each user with their title and affiliation,
* and appends these list items to a specified list in the document.
*
* @async
* @function insertUsersInfoIntoDocument
*/
async function insertUsersInfoIntoDocument() {
const usersInfo = await getUsersInfo();
const usersList = document.querySelector(`#${LIST_ID} ul`);

for (const user of usersInfo) {
const fragment = document.createDocumentFragment();

usersInfo.forEach(user => {
const li = document.createElement("li");
li.textContent = `${user.title} (${user.affiliation})`;
usersList.appendChild(li);
}
fragment.appendChild(li);
});

usersList.appendChild(fragment);
}

insertUsersInfoIntoDocument();
Expand Down
117 changes: 115 additions & 2 deletions core-aam/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<script src="../common/script/resolveReferences.js" class="remove"></script>
<script src="../common/script/utility.js" class="remove"></script>
<script src="../common/biblio.js" class="remove" defer></script>
<script src="../common/script/participants.js" class="remove"></script>

<link href="../common/css/mapping-tables.css" rel="stylesheet" type="text/css" />
<link href="../common/css/common.css" rel="stylesheet" type="text/css" />
Expand Down Expand Up @@ -130,7 +131,7 @@
REC: "https://www.w3.org/TR/accname-1.2/",
},

preProcess: [linkCrossReferences],
preProcess: [linkCrossReferences, getParticipants],
postProcess: [addPlatformMaintainers],
xref: ["dom", "accname", "wai-aria", "infra"],
};
Expand Down Expand Up @@ -4320,6 +4321,9 @@ <h4 id="role-map-searchbox"><code>searchbox</code></h4>
><br />
<span class="property">Object Attribute: <code>xml-roles:searchbox</code></span
><br />
<span class="property">Object Attribute: <code>text-input-type:search</code>
</span>
<br />
<span class="property"
>Interface: <code>EditableText</code> if <a class="property-reference" href="#aria-readonly"><code>aria-readonly</code></a> is not <code>&quot;true&quot;</code></span
>
Expand All @@ -4338,6 +4342,109 @@ <h4 id="role-map-searchbox"><code>searchbox</code></h4>
</tr>
</tbody>
</table>
<h4 id="role-map-sectionfooter"><code>sectionfooter</code></h4>
<table aria-labelledby="role-map-sectionfooter">
<tbody>
<tr>
<th>ARIA Specification</th>
<td>
<a class="role-reference" href="#sectionfooter"><code>sectionfooter</code></a>
</td>
</tr>
<tr>
<th>Computed Role</th>
<td>
<p><code>sectionfooter</code></p>
</td>
</tr>
<tr>
<th>MSAA + IAccessible2</th>
<td>
<span class="property">Role: <code>ROLE_SYSTEM_GROUPING</code></span
><br />
<span class="property">Object Attribute: <code>xml-roles:sectionfooter</code></span>
</td>
</tr>
<tr>
<th><abbr title="User Interface Automation">UIA</abbr></th>
<td>
<span class="property">Control Type: <code>Group</code></span
><br />
<span class="property">Localized Control Type: <code>section footer</code></span>
</td>
</tr>
<tr>
<th><abbr title="Accessibility Toolkit">ATK</abbr>/<abbr title="Assistive Technology - Service Provider Interface">AT-SPI</abbr></th>
<td>
<span class="property">Role: <code>ROLE_FOOTER</code></span
><br />
</td>
</tr>
<tr>
<th>
<abbr title="macOS Accessibility Protocol">AX API</abbr><sup>[<a href="#ftn.note1">Note 1</a>]</sup>
</th>
<td>
<span class="property">AXRole: <code>AXGroup</code></span
><br />
<span class="property">AXSubrole: <code>AXSectionFooter</code></span
><br />
<span class="property">AXRoleDescription: <code>section footer</code></span>
</td>
</tr>
</tbody>
</table>
<h4 id="role-map-sectionheader"><code>sectionheader</code></h4>
<table aria-labelledby="role-map-sectionheader">
<tbody>
<tr>
<th>ARIA Specification</th>
<td>
<a class="role-reference" href="#sectionheader"><code>sectionheader</code></a>
</td>
</tr>
<tr>
<th>Computed Role</th>
<td>
<p><code>sectionheader</code></p>
</td>
</tr>
<tr>
<th>MSAA + IAccessible2</th>
<td>
<span class="property">Role: <code>ROLE_SYSTEM_GROUPING</code></span
><br />
<span class="property">Object Attribute: <code>xml-roles:sectionheader</code></span>
</td>
</tr>
<tr>
<th><abbr title="User Interface Automation">UIA</abbr></th>
<td>
<span class="property">Control Type: <code>Group</code></span
><br />
<span class="property">Localized Control Type: <code>section header</code></span>
</td>
</tr>
<tr>
<th><abbr title="Accessibility Toolkit">ATK</abbr>/<abbr title="Assistive Technology - Service Provider Interface">AT-SPI</abbr></th>
<td>
<span class="property">Role: <code>ROLE_HEADER</code></span>
</td>
</tr>
<tr>
<th>
<abbr title="macOS Accessibility Protocol">AX API</abbr><sup>[<a href="#ftn.note1">Note 1</a>]</sup>
</th>
<td>
<span class="property">AXRole: <code>AXGroup</code></span
><br />
<span class="property">AXSubrole: <code>AXSectionHeader</code></span
><br />
<span class="property">AXRoleDescription: <code>section header</code></span>
</td>
</tr>
</tbody>
</table>
<h4 id="role-map-separator"><code>separator</code> (non-focusable)</h4>
<table aria-labelledby="role-map-separator">
<tbody>
Expand Down Expand Up @@ -11077,6 +11184,7 @@ <h2>Change Log</h2>
<h2>Substantive changes since the last <a href="https://www.w3.org/TR/2022/CR-core-aam-1.2-20221122/">Candidate Recommendation Snapshot</a></h2>
<ul>
<!-- EdNote: After each WD publish, move contents of this list into the next one below. -->
<li>14-Nov-2022: add new AX API mappings for colindextext/rowindextext</li>
<li>4-Jan-2024: Fix: errant computed role for treegrid row</li>
<li>31-Oct-2023: Update UIA aria-readonly mappings</li>
<li>31-Oct-2023: Add aria-haspopup='grid' mappings</li>
Expand Down Expand Up @@ -11144,7 +11252,12 @@ <h3>Acknowledgments</h3>
<ul id="gh-contributors">
<!-- list of contributors will appear here, along with link to their GitHub profiles -->
</ul>
<div data-include="../common/acknowledgements/aria-wg-active.html" data-include-replace="true"></div>
<section class="section" id="ack_group">
<h4>ARIA WG participants at the time of publication</h4>
<ul>
<!-- List of participants is injected here -->
</ul>
</section>
<div data-include="../common/acknowledgements/funders.html" data-include-replace="true"></div>
</section>
</body>
Expand Down
Loading

0 comments on commit fa0b411

Please sign in to comment.