Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Aria attributes for WCAG #95

Merged
merged 2 commits into from
Oct 28, 2022
Merged

Aria attributes for WCAG #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8d6d17
Aria attributes for WCAG
ellinge Oct 28, 2022
fd2581d
Remove whitespace
ellinge Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion autocomplete.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion autocomplete.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion autocomplete.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion autocomplete.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 28 additions & 1 deletion autocomplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
const doc = document;

const container: HTMLDivElement = settings.container || doc.createElement("div");
let containerId = container.id;
if(!containerId || !containerId.length) {
let index = 0;
do {
containerId = "autocomplete-" + index++;
} while (doc.getElementById(containerId) != null && index < 100000);
container.id = containerId;
}
const containerStyle = container.style;
const userAgent = navigator.userAgent;
const mobileFirefox = ~userAgent.indexOf("Firefox") && ~userAgent.indexOf("Mobile");
Expand Down Expand Up @@ -160,6 +168,12 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
const input: HTMLInputElement | HTMLTextAreaElement = settings.input;

container.className = "autocomplete " + (settings.className || "");
input.setAttribute("aria-role", "combobox");
input.setAttribute("aria-expanded", "false");
input.setAttribute("aria-autocomplete", "list");
input.setAttribute("aria-controls", containerId);
input.setAttribute("aria-activedescendant", "");
container.setAttribute("aria-role", "listbox");

// IOS implementation for fixed positioning has many bugs, so we will use absolute positioning
containerStyle.position = "absolute";
Expand Down Expand Up @@ -209,6 +223,8 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
items = [];
inputValue = "";
selected = undefined;
input.setAttribute("aria-activedescendant", "");
input.setAttribute("aria-expanded", "false");
detach();
}

Expand All @@ -219,6 +235,8 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
if (!containerDisplayed()) {
return;
}

input.setAttribute("aria-expanded", "true");

containerStyle.height = "auto";
containerStyle.width = input.offsetWidth + "px";
Expand Down Expand Up @@ -295,7 +313,7 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
const fragment = doc.createDocumentFragment();
let prevGroup = "#9?$";

items.forEach(function(item: T): void {
items.forEach(function(item: T, index: number): void {
if (item.group && item.group !== prevGroup) {
prevGroup = item.group;
const groupDiv = renderGroup(item.group, inputValue);
Expand All @@ -306,6 +324,8 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
}
const div = render(item, inputValue);
if (div) {
div.id = `${containerId}_${index}`;
div.setAttribute("aria-role", "option");
div.addEventListener("click", function(ev: MouseEvent): void {
settings.onSelect(item, input);
clear();
Expand All @@ -314,6 +334,8 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
});
if (item === selected) {
div.className += " selected";
div.setAttribute("aria-selected", "true");
input.setAttribute("aria-activedescendant", div.id);
}
fragment.appendChild(div);
}
Expand Down Expand Up @@ -545,6 +567,11 @@ export default function autocomplete<T extends AutocompleteItem>(settings: Autoc
input.removeEventListener("blur", blurEventHandler);
window.removeEventListener("resize", resizeEventHandler);
doc.removeEventListener("scroll", scrollEventHandler, true);
input.removeAttribute("aria-role");
input.removeAttribute("aria-expanded");
input.removeAttribute("aria-autocomplete");
input.removeAttribute("aria-controls");
input.removeAttribute("aria-activedescendant");
clearDebounceTimer();
clear();
}
Expand Down
Loading