@zerolith/a11y 0.1.0-alpha.5 → 0.1.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/announce.d.ts +3 -1
- package/dist/announce.d.ts.map +1 -1
- package/dist/announce.js +14 -6
- package/dist/announce.js.map +1 -1
- package/dist/focus.d.ts +4 -1
- package/dist/focus.d.ts.map +1 -1
- package/dist/focus.js +36 -8
- package/dist/focus.js.map +1 -1
- package/package.json +3 -3
- package/src/announce.ts +15 -6
- package/src/focus.ts +45 -8
package/dist/announce.d.ts
CHANGED
|
@@ -16,7 +16,9 @@ export interface Announcer {
|
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
18
|
* Creates a pair of live regions, one polite and one assertive, appended to
|
|
19
|
-
* the document body
|
|
19
|
+
* the document body at once, so assistive technology knows them before the
|
|
20
|
+
* first message, and hidden visually by inline styles, which hold in any
|
|
21
|
+
* document `doc` names. Each announcement clears the
|
|
20
22
|
* region and writes the message on the next task, so repeating a message
|
|
21
23
|
* is read again.
|
|
22
24
|
*/
|
package/dist/announce.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"announce.d.ts","sourceRoot":"","sources":["../src/announce.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,UAAU,CAAC;AAE5C,iGAAiG;AACjG,eAAO,MAAM,cAAc,EAAE,MAE5B,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEhD,sCAAsC;AACtC,MAAM,WAAW,SAAS;IAEtB,uFAAuF;IACvF,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IACzD,gCAAgC;IAChC,OAAO,IAAI,IAAI,CAAC;CACnB;AAED
|
|
1
|
+
{"version":3,"file":"announce.d.ts","sourceRoot":"","sources":["../src/announce.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,UAAU,CAAC;AAE5C,iGAAiG;AACjG,eAAO,MAAM,cAAc,EAAE,MAE5B,CAAC;AAEF,sCAAsC;AACtC,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEhD,sCAAsC;AACtC,MAAM,WAAW,SAAS;IAEtB,uFAAuF;IACvF,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IACzD,gCAAgC;IAChC,OAAO,IAAI,IAAI,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,GAAE,QAAmB,GAAG,SAAS,CA+CnE"}
|
package/dist/announce.js
CHANGED
|
@@ -9,7 +9,9 @@ export const visuallyHidden = css `
|
|
|
9
9
|
`;
|
|
10
10
|
/**
|
|
11
11
|
* Creates a pair of live regions, one polite and one assertive, appended to
|
|
12
|
-
* the document body
|
|
12
|
+
* the document body at once, so assistive technology knows them before the
|
|
13
|
+
* first message, and hidden visually by inline styles, which hold in any
|
|
14
|
+
* document `doc` names. Each announcement clears the
|
|
13
15
|
* region and writes the message on the next task, so repeating a message
|
|
14
16
|
* is read again.
|
|
15
17
|
*/
|
|
@@ -23,23 +25,29 @@ export function createAnnouncer(doc = document) {
|
|
|
23
25
|
element.setAttribute("aria-atomic", "true");
|
|
24
26
|
element.setAttribute("role", politeness === "assertive" ? "alert" : "status");
|
|
25
27
|
element.className = `zl-s ${visuallyHidden.scope}`;
|
|
28
|
+
element.setAttribute("style", "position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; border: 0;");
|
|
26
29
|
doc.body.append(element);
|
|
27
30
|
regions.set(politeness, element);
|
|
28
31
|
}
|
|
29
32
|
return element;
|
|
30
33
|
};
|
|
31
|
-
|
|
34
|
+
region("polite");
|
|
35
|
+
region("assertive");
|
|
36
|
+
const timers = new Map();
|
|
32
37
|
return {
|
|
33
38
|
announce(message, politeness = "polite") {
|
|
34
39
|
const element = region(politeness);
|
|
35
40
|
element.textContent = "";
|
|
36
|
-
clearTimeout(
|
|
37
|
-
|
|
41
|
+
clearTimeout(timers.get(politeness));
|
|
42
|
+
timers.set(politeness, setTimeout(() => {
|
|
38
43
|
element.textContent = message;
|
|
39
|
-
}, 0);
|
|
44
|
+
}, 0));
|
|
40
45
|
},
|
|
41
46
|
dispose() {
|
|
42
|
-
|
|
47
|
+
for (const timer of timers.values()) {
|
|
48
|
+
clearTimeout(timer);
|
|
49
|
+
}
|
|
50
|
+
timers.clear();
|
|
43
51
|
for (const element of regions.values()) {
|
|
44
52
|
element.remove();
|
|
45
53
|
}
|
package/dist/announce.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"announce.js","sourceRoot":"","sources":["../src/announce.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAe,GAAG,EAAE,MAAM,UAAU,CAAC;AAE5C,iGAAiG;AACjG,MAAM,CAAC,MAAM,cAAc,GAAW,GAAG,CAAA;;CAExC,CAAC;AAcF
|
|
1
|
+
{"version":3,"file":"announce.js","sourceRoot":"","sources":["../src/announce.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAe,GAAG,EAAE,MAAM,UAAU,CAAC;AAE5C,iGAAiG;AACjG,MAAM,CAAC,MAAM,cAAc,GAAW,GAAG,CAAA;;CAExC,CAAC;AAcF;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,GAAG,GAAa,QAAQ;IAEpD,MAAM,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;IACnD,MAAM,MAAM,GAAG,CAAC,UAAsB,EAAe,EAAE;QAEnD,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtC,IAAI,OAAO,KAAK,SAAS,EACzB,CAAC;YACG,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAC9C,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAC5C,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9E,OAAO,CAAC,SAAS,GAAG,QAAQ,cAAc,CAAC,KAAK,EAAE,CAAC;YACnD,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,iJAAiJ,CAAC,CAAC;YACjL,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjB,MAAM,CAAC,WAAW,CAAC,CAAC;IACpB,MAAM,MAAM,GAAG,IAAI,GAAG,EAA6C,CAAC;IACpE,OAAO;QACH,QAAQ,CAAC,OAAe,EAAE,UAAU,GAAe,QAAQ;YAEvD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;YACnC,OAAO,CAAC,WAAW,GAAG,EAAE,CAAC;YACzB,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,EAAE;gBAEnC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC;YAClC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACX,CAAC;QACD,OAAO;YAEH,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EACnC,CAAC;gBACG,YAAY,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC;YACD,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,EACtC,CAAC;gBACG,OAAO,CAAC,MAAM,EAAE,CAAC;YACrB,CAAC;YACD,OAAO,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC;KACJ,CAAC;AACN,CAAC"}
|
package/dist/focus.d.ts
CHANGED
|
@@ -18,6 +18,8 @@ export interface FocusTrapOptions {
|
|
|
18
18
|
* A `ref` that keeps Tab and Shift+Tab inside the element, pulls focus back
|
|
19
19
|
* when it lands outside, moves focus in once the element is in the document,
|
|
20
20
|
* and returns it where it came from when the element's template is removed.
|
|
21
|
+
* With traps on several elements, as when a dialog opens a confirmation,
|
|
22
|
+
* only the newest acts until its template is removed.
|
|
21
23
|
*/
|
|
22
24
|
export declare function focusTrap(options?: FocusTrapOptions): (element: Element) => void;
|
|
23
25
|
/** Options for `rovingTabindex`. */
|
|
@@ -32,7 +34,8 @@ export interface RovingOptions {
|
|
|
32
34
|
/**
|
|
33
35
|
* A `ref` for a composite widget: exactly one item is in the Tab order, the
|
|
34
36
|
* arrow keys, Home, and End move between items, and the item that was
|
|
35
|
-
* selected or checked starts as the current one.
|
|
37
|
+
* selected or checked starts as the current one. Disabled, hidden, and
|
|
38
|
+
* inert items are skipped, as the children of a collapsed tree item are.
|
|
36
39
|
*/
|
|
37
40
|
export declare function rovingTabindex(options?: RovingOptions): (element: Element) => void;
|
|
38
41
|
/** How the element that has focus got it. */
|
package/dist/focus.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"focus.d.ts","sourceRoot":"","sources":["../src/focus.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"focus.d.ts","sourceRoot":"","sources":["../src/focus.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,UAAU,CAAC;AAwBlE,mGAAmG;AACnG,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,WAAW,EAAE,CAGvD;AAKD,+BAA+B;AAC/B,MAAM,WAAW,gBAAgB;IAE7B,uKAAuK;IACvK,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,KAAK,CAAC;IACvC,2FAA2F;IAC3F,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CA8FpF;AAED,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAE1B,uGAAuG;IACvG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mHAAmH;IACnH,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,GAAG,MAAM,CAAC;IACjD,wEAAwE;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC;CAClB;AAID;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,GAAE,aAAkB,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CA6FtF;AAED,6CAA6C;AAC7C,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;AAEvE,kCAAkC;AAClC,MAAM,WAAW,kBAAkB;IAE/B,wFAAwF;IACxF,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACpD,+CAA+C;IAC/C,OAAO,IAAI,IAAI,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,GAAG,GAAE,QAAmB,GAAG,kBAAkB,CA8CxE"}
|
package/dist/focus.js
CHANGED
|
@@ -5,15 +5,33 @@
|
|
|
5
5
|
* the element is created and clean up when its template is removed.
|
|
6
6
|
*/
|
|
7
7
|
import { onDispose, signal } from "zerolith";
|
|
8
|
-
const FOCUSABLE = "a[href], area[href], button:not(
|
|
8
|
+
const FOCUSABLE = "a[href], area[href], button:not(:disabled), input:not(:disabled):not([type=hidden]), select:not(:disabled), textarea:not(:disabled), [tabindex]:not([tabindex=\"-1\"]):not(:disabled), [contenteditable=\"true\"], audio[controls], video[controls], details > summary, iframe";
|
|
9
|
+
/** True when an element is rendered, visible, and outside any `inert` subtree, so it can take focus. */
|
|
10
|
+
function reachable(element) {
|
|
11
|
+
return element.getClientRects().length > 0 && element.closest("[inert]") === null && (element.ownerDocument.defaultView ?? window).getComputedStyle(element).visibility === "visible";
|
|
12
|
+
}
|
|
13
|
+
/** True for a control that uses the arrow keys itself: a text field, a list box, or editable text. */
|
|
14
|
+
function editsText(target) {
|
|
15
|
+
if (!(target instanceof HTMLElement)) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
if (target instanceof HTMLInputElement) {
|
|
19
|
+
return !["button", "checkbox", "color", "file", "hidden", "image", "radio", "range", "reset", "submit"].includes(target.type);
|
|
20
|
+
}
|
|
21
|
+
return target instanceof HTMLTextAreaElement || target instanceof HTMLSelectElement || target.isContentEditable;
|
|
22
|
+
}
|
|
9
23
|
/** The elements inside `root` that take Tab focus, in document order, skipping anything hidden. */
|
|
10
24
|
export function focusables(root) {
|
|
11
|
-
return [...root.querySelectorAll(FOCUSABLE)].filter(
|
|
25
|
+
return [...root.querySelectorAll(FOCUSABLE)].filter(reachable);
|
|
12
26
|
}
|
|
27
|
+
/** The elements with an attached focus trap, newest last. Only the newest acts, so a dialog opened from another keeps focus, and removing it hands control back. */
|
|
28
|
+
const traps = [];
|
|
13
29
|
/**
|
|
14
30
|
* A `ref` that keeps Tab and Shift+Tab inside the element, pulls focus back
|
|
15
31
|
* when it lands outside, moves focus in once the element is in the document,
|
|
16
32
|
* and returns it where it came from when the element's template is removed.
|
|
33
|
+
* With traps on several elements, as when a dialog opens a confirmation,
|
|
34
|
+
* only the newest acts until its template is removed.
|
|
17
35
|
*/
|
|
18
36
|
export function focusTrap(options = {}) {
|
|
19
37
|
return (element) => {
|
|
@@ -30,6 +48,7 @@ export function focusTrap(options = {}) {
|
|
|
30
48
|
return element;
|
|
31
49
|
};
|
|
32
50
|
let disposed = false;
|
|
51
|
+
traps.push(element);
|
|
33
52
|
const initial = options.initial;
|
|
34
53
|
const focusInitial = () => {
|
|
35
54
|
if (disposed || !element.isConnected || initial === false) {
|
|
@@ -48,7 +67,7 @@ export function focusTrap(options = {}) {
|
|
|
48
67
|
}
|
|
49
68
|
const onKeydown = (event) => {
|
|
50
69
|
const key = event;
|
|
51
|
-
if (key.key !== "Tab") {
|
|
70
|
+
if (key.key !== "Tab" || traps.at(-1) !== element) {
|
|
52
71
|
return;
|
|
53
72
|
}
|
|
54
73
|
const list = focusables(element);
|
|
@@ -69,7 +88,7 @@ export function focusTrap(options = {}) {
|
|
|
69
88
|
}
|
|
70
89
|
};
|
|
71
90
|
const onFocusIn = (event) => {
|
|
72
|
-
if (!element.contains(event.target)) {
|
|
91
|
+
if (traps.at(-1) === element && !element.contains(event.target)) {
|
|
73
92
|
fallback().focus();
|
|
74
93
|
}
|
|
75
94
|
};
|
|
@@ -77,6 +96,10 @@ export function focusTrap(options = {}) {
|
|
|
77
96
|
doc.addEventListener("focusin", onFocusIn);
|
|
78
97
|
onDispose(() => {
|
|
79
98
|
disposed = true;
|
|
99
|
+
const index = traps.lastIndexOf(element);
|
|
100
|
+
if (index !== -1) {
|
|
101
|
+
traps.splice(index, 1);
|
|
102
|
+
}
|
|
80
103
|
element.removeEventListener("keydown", onKeydown);
|
|
81
104
|
doc.removeEventListener("focusin", onFocusIn);
|
|
82
105
|
if (options.restore !== false && previous !== null && previous.isConnected) {
|
|
@@ -89,24 +112,26 @@ const ROVING_ITEMS = "[data-roving], [role=\"tab\"], [role=\"menuitem\"], [role=
|
|
|
89
112
|
/**
|
|
90
113
|
* A `ref` for a composite widget: exactly one item is in the Tab order, the
|
|
91
114
|
* arrow keys, Home, and End move between items, and the item that was
|
|
92
|
-
* selected or checked starts as the current one.
|
|
115
|
+
* selected or checked starts as the current one. Disabled, hidden, and
|
|
116
|
+
* inert items are skipped, as the children of a collapsed tree item are.
|
|
93
117
|
*/
|
|
94
118
|
export function rovingTabindex(options = {}) {
|
|
95
119
|
const selector = options.items ?? ROVING_ITEMS;
|
|
96
120
|
const orientation = options.orientation ?? "both";
|
|
97
121
|
const loop = options.loop !== false;
|
|
98
122
|
return (element) => {
|
|
99
|
-
const
|
|
123
|
+
const all = () => [...element.querySelectorAll(selector)];
|
|
124
|
+
const items = () => all().filter((item) => !item.hasAttribute("disabled") && item.getAttribute("aria-disabled") !== "true");
|
|
100
125
|
let current;
|
|
101
126
|
const apply = (next) => {
|
|
102
127
|
const list = items();
|
|
103
128
|
current = next !== undefined && list.includes(next) ? next : list.find((item) => item.getAttribute("aria-selected") === "true" || item.getAttribute("aria-checked") === "true") ?? list[0];
|
|
104
|
-
for (const item of
|
|
129
|
+
for (const item of all()) {
|
|
105
130
|
item.tabIndex = item === current ? 0 : -1;
|
|
106
131
|
}
|
|
107
132
|
};
|
|
108
133
|
const move = (step, edge) => {
|
|
109
|
-
const list = items();
|
|
134
|
+
const list = items().filter(reachable);
|
|
110
135
|
if (list.length === 0) {
|
|
111
136
|
return;
|
|
112
137
|
}
|
|
@@ -125,6 +150,9 @@ export function rovingTabindex(options = {}) {
|
|
|
125
150
|
};
|
|
126
151
|
const onKeydown = (event) => {
|
|
127
152
|
const key = event;
|
|
153
|
+
if (editsText(key.target) && !items().includes(key.target)) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
128
156
|
const horizontal = orientation !== "vertical";
|
|
129
157
|
const vertical = orientation !== "horizontal";
|
|
130
158
|
if ((key.key === "ArrowRight" && horizontal) || (key.key === "ArrowDown" && vertical)) {
|
package/dist/focus.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"focus.js","sourceRoot":"","sources":["../src/focus.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAuB,SAAS,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElE,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"focus.js","sourceRoot":"","sources":["../src/focus.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zerolith/a11y",
|
|
3
|
-
"version": "0.1.0-alpha.
|
|
3
|
+
"version": "0.1.0-alpha.6",
|
|
4
4
|
"description": "Accessibility primitives for zerolith: focus trap, roving tabindex, live announcer, focus origin, visually hidden styles, and media query signals, the pieces every component library rebuilds",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"author": "molexxxx",
|
|
@@ -42,9 +42,9 @@
|
|
|
42
42
|
"build": "tsc -p tsconfig.build.json"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
45
|
-
"zerolith": "^0.1.0-alpha.
|
|
45
|
+
"zerolith": "^0.1.0-alpha.6"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"zerolith": "^0.1.0-alpha.
|
|
48
|
+
"zerolith": "^0.1.0-alpha.6"
|
|
49
49
|
}
|
|
50
50
|
}
|
package/src/announce.ts
CHANGED
|
@@ -23,7 +23,9 @@ export interface Announcer
|
|
|
23
23
|
|
|
24
24
|
/**
|
|
25
25
|
* Creates a pair of live regions, one polite and one assertive, appended to
|
|
26
|
-
* the document body
|
|
26
|
+
* the document body at once, so assistive technology knows them before the
|
|
27
|
+
* first message, and hidden visually by inline styles, which hold in any
|
|
28
|
+
* document `doc` names. Each announcement clears the
|
|
27
29
|
* region and writes the message on the next task, so repeating a message
|
|
28
30
|
* is read again.
|
|
29
31
|
*/
|
|
@@ -40,26 +42,33 @@ export function createAnnouncer(doc: Document = document): Announcer
|
|
|
40
42
|
element.setAttribute("aria-atomic", "true");
|
|
41
43
|
element.setAttribute("role", politeness === "assertive" ? "alert" : "status");
|
|
42
44
|
element.className = `zl-s ${visuallyHidden.scope}`;
|
|
45
|
+
element.setAttribute("style", "position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; border: 0;");
|
|
43
46
|
doc.body.append(element);
|
|
44
47
|
regions.set(politeness, element);
|
|
45
48
|
}
|
|
46
49
|
return element;
|
|
47
50
|
};
|
|
48
|
-
|
|
51
|
+
region("polite");
|
|
52
|
+
region("assertive");
|
|
53
|
+
const timers = new Map<Politeness, ReturnType<typeof setTimeout>>();
|
|
49
54
|
return {
|
|
50
55
|
announce(message: string, politeness: Politeness = "polite"): void
|
|
51
56
|
{
|
|
52
57
|
const element = region(politeness);
|
|
53
58
|
element.textContent = "";
|
|
54
|
-
clearTimeout(
|
|
55
|
-
|
|
59
|
+
clearTimeout(timers.get(politeness));
|
|
60
|
+
timers.set(politeness, setTimeout(() =>
|
|
56
61
|
{
|
|
57
62
|
element.textContent = message;
|
|
58
|
-
}, 0);
|
|
63
|
+
}, 0));
|
|
59
64
|
},
|
|
60
65
|
dispose(): void
|
|
61
66
|
{
|
|
62
|
-
|
|
67
|
+
for (const timer of timers.values())
|
|
68
|
+
{
|
|
69
|
+
clearTimeout(timer);
|
|
70
|
+
}
|
|
71
|
+
timers.clear();
|
|
63
72
|
for (const element of regions.values())
|
|
64
73
|
{
|
|
65
74
|
element.remove();
|
package/src/focus.ts
CHANGED
|
@@ -6,14 +6,37 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { type ReadableSignal, onDispose, signal } from "zerolith";
|
|
8
8
|
|
|
9
|
-
const FOCUSABLE = "a[href], area[href], button:not(
|
|
9
|
+
const FOCUSABLE = "a[href], area[href], button:not(:disabled), input:not(:disabled):not([type=hidden]), select:not(:disabled), textarea:not(:disabled), [tabindex]:not([tabindex=\"-1\"]):not(:disabled), [contenteditable=\"true\"], audio[controls], video[controls], details > summary, iframe";
|
|
10
|
+
|
|
11
|
+
/** True when an element is rendered, visible, and outside any `inert` subtree, so it can take focus. */
|
|
12
|
+
function reachable(element: Element): boolean
|
|
13
|
+
{
|
|
14
|
+
return element.getClientRects().length > 0 && element.closest("[inert]") === null && (element.ownerDocument.defaultView ?? window).getComputedStyle(element).visibility === "visible";
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** True for a control that uses the arrow keys itself: a text field, a list box, or editable text. */
|
|
18
|
+
function editsText(target: EventTarget | null): boolean
|
|
19
|
+
{
|
|
20
|
+
if (!(target instanceof HTMLElement))
|
|
21
|
+
{
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
if (target instanceof HTMLInputElement)
|
|
25
|
+
{
|
|
26
|
+
return !["button", "checkbox", "color", "file", "hidden", "image", "radio", "range", "reset", "submit"].includes(target.type);
|
|
27
|
+
}
|
|
28
|
+
return target instanceof HTMLTextAreaElement || target instanceof HTMLSelectElement || target.isContentEditable;
|
|
29
|
+
}
|
|
10
30
|
|
|
11
31
|
/** The elements inside `root` that take Tab focus, in document order, skipping anything hidden. */
|
|
12
32
|
export function focusables(root: Element): HTMLElement[]
|
|
13
33
|
{
|
|
14
|
-
return [...root.querySelectorAll<HTMLElement>(FOCUSABLE)].filter(
|
|
34
|
+
return [...root.querySelectorAll<HTMLElement>(FOCUSABLE)].filter(reachable);
|
|
15
35
|
}
|
|
16
36
|
|
|
37
|
+
/** The elements with an attached focus trap, newest last. Only the newest acts, so a dialog opened from another keeps focus, and removing it hands control back. */
|
|
38
|
+
const traps: Element[] = [];
|
|
39
|
+
|
|
17
40
|
/** Options for `focusTrap`. */
|
|
18
41
|
export interface FocusTrapOptions
|
|
19
42
|
{
|
|
@@ -27,6 +50,8 @@ export interface FocusTrapOptions
|
|
|
27
50
|
* A `ref` that keeps Tab and Shift+Tab inside the element, pulls focus back
|
|
28
51
|
* when it lands outside, moves focus in once the element is in the document,
|
|
29
52
|
* and returns it where it came from when the element's template is removed.
|
|
53
|
+
* With traps on several elements, as when a dialog opens a confirmation,
|
|
54
|
+
* only the newest acts until its template is removed.
|
|
30
55
|
*/
|
|
31
56
|
export function focusTrap(options: FocusTrapOptions = {}): (element: Element) => void
|
|
32
57
|
{
|
|
@@ -48,6 +73,7 @@ export function focusTrap(options: FocusTrapOptions = {}): (element: Element) =>
|
|
|
48
73
|
return element as HTMLElement;
|
|
49
74
|
};
|
|
50
75
|
let disposed = false;
|
|
76
|
+
traps.push(element);
|
|
51
77
|
const initial = options.initial;
|
|
52
78
|
const focusInitial = (): void =>
|
|
53
79
|
{
|
|
@@ -72,7 +98,7 @@ export function focusTrap(options: FocusTrapOptions = {}): (element: Element) =>
|
|
|
72
98
|
const onKeydown = (event: Event): void =>
|
|
73
99
|
{
|
|
74
100
|
const key = event as KeyboardEvent;
|
|
75
|
-
if (key.key !== "Tab")
|
|
101
|
+
if (key.key !== "Tab" || traps.at(-1) !== element)
|
|
76
102
|
{
|
|
77
103
|
return;
|
|
78
104
|
}
|
|
@@ -98,7 +124,7 @@ export function focusTrap(options: FocusTrapOptions = {}): (element: Element) =>
|
|
|
98
124
|
};
|
|
99
125
|
const onFocusIn = (event: Event): void =>
|
|
100
126
|
{
|
|
101
|
-
if (!element.contains(event.target as Node))
|
|
127
|
+
if (traps.at(-1) === element && !element.contains(event.target as Node))
|
|
102
128
|
{
|
|
103
129
|
fallback().focus();
|
|
104
130
|
}
|
|
@@ -108,6 +134,11 @@ export function focusTrap(options: FocusTrapOptions = {}): (element: Element) =>
|
|
|
108
134
|
onDispose(() =>
|
|
109
135
|
{
|
|
110
136
|
disposed = true;
|
|
137
|
+
const index = traps.lastIndexOf(element);
|
|
138
|
+
if (index !== -1)
|
|
139
|
+
{
|
|
140
|
+
traps.splice(index, 1);
|
|
141
|
+
}
|
|
111
142
|
element.removeEventListener("keydown", onKeydown);
|
|
112
143
|
doc.removeEventListener("focusin", onFocusIn);
|
|
113
144
|
if (options.restore !== false && previous !== null && previous.isConnected)
|
|
@@ -134,7 +165,8 @@ const ROVING_ITEMS = "[data-roving], [role=\"tab\"], [role=\"menuitem\"], [role=
|
|
|
134
165
|
/**
|
|
135
166
|
* A `ref` for a composite widget: exactly one item is in the Tab order, the
|
|
136
167
|
* arrow keys, Home, and End move between items, and the item that was
|
|
137
|
-
* selected or checked starts as the current one.
|
|
168
|
+
* selected or checked starts as the current one. Disabled, hidden, and
|
|
169
|
+
* inert items are skipped, as the children of a collapsed tree item are.
|
|
138
170
|
*/
|
|
139
171
|
export function rovingTabindex(options: RovingOptions = {}): (element: Element) => void
|
|
140
172
|
{
|
|
@@ -143,20 +175,21 @@ export function rovingTabindex(options: RovingOptions = {}): (element: Element)
|
|
|
143
175
|
const loop = options.loop !== false;
|
|
144
176
|
return (element) =>
|
|
145
177
|
{
|
|
146
|
-
const
|
|
178
|
+
const all = (): HTMLElement[] => [...element.querySelectorAll<HTMLElement>(selector)];
|
|
179
|
+
const items = (): HTMLElement[] => all().filter((item) => !item.hasAttribute("disabled") && item.getAttribute("aria-disabled") !== "true");
|
|
147
180
|
let current: HTMLElement | undefined;
|
|
148
181
|
const apply = (next: HTMLElement | undefined): void =>
|
|
149
182
|
{
|
|
150
183
|
const list = items();
|
|
151
184
|
current = next !== undefined && list.includes(next) ? next : list.find((item) => item.getAttribute("aria-selected") === "true" || item.getAttribute("aria-checked") === "true") ?? list[0];
|
|
152
|
-
for (const item of
|
|
185
|
+
for (const item of all())
|
|
153
186
|
{
|
|
154
187
|
item.tabIndex = item === current ? 0 : -1;
|
|
155
188
|
}
|
|
156
189
|
};
|
|
157
190
|
const move = (step: number, edge?: "first" | "last"): void =>
|
|
158
191
|
{
|
|
159
|
-
const list = items();
|
|
192
|
+
const list = items().filter(reachable);
|
|
160
193
|
if (list.length === 0)
|
|
161
194
|
{
|
|
162
195
|
return;
|
|
@@ -180,6 +213,10 @@ export function rovingTabindex(options: RovingOptions = {}): (element: Element)
|
|
|
180
213
|
const onKeydown = (event: Event): void =>
|
|
181
214
|
{
|
|
182
215
|
const key = event as KeyboardEvent;
|
|
216
|
+
if (editsText(key.target) && !items().includes(key.target as HTMLElement))
|
|
217
|
+
{
|
|
218
|
+
return;
|
|
219
|
+
}
|
|
183
220
|
const horizontal = orientation !== "vertical";
|
|
184
221
|
const vertical = orientation !== "horizontal";
|
|
185
222
|
if ((key.key === "ArrowRight" && horizontal) || (key.key === "ArrowDown" && vertical))
|