@botiverse/porthole 0.14.10 → 0.14.12

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.
@@ -34,14 +34,37 @@ export const MARKER_HIT = String.raw`(count, boxAt, x, y, touch) => {
34
34
  return best;
35
35
  }`;
36
36
 
37
+ /**
38
+ * What a marker is called (P133, P134), to whoever can't see it, spliced into the runtime: what it
39
+ * is, and the words it is on, in quotes. In English, whatever the page's language: the shell has no
40
+ * words of the host's. `anchor.label` stays as the host stores it (it is the host's to show): an
41
+ * element's starts with its tag (`describe`, "p#intro.lead Words"), so an element's words are its
42
+ * quote, cut where the label's are and marked so, or for one with no text of its own (an image's
43
+ * `alt`) what follows the tag in the label. An element with neither has no words.
44
+ */
45
+ export const MARKER_NAME = String.raw`(mark) => {
46
+ const squash = (text) => String(text).replace(/\s+/g, " ").trim();
47
+ const anchor = mark.anchor;
48
+ const label = typeof anchor.label === "string" ? squash(anchor.label).slice(0, 120) : "";
49
+ let words = label;
50
+ if (anchor.kind === "element") {
51
+ const quote = anchor.selectors.filter((each) => each && each.type === "TextQuoteSelector")[0];
52
+ const said = quote && typeof quote.exact === "string" ? squash(quote.exact.slice(0, 300)) : "";
53
+ const space = label.indexOf(" ");
54
+ words = said.length > 40 ? said.slice(0, 40).trim() + "\u2026" : said !== "" ? said : space === -1 ? "" : label.slice(space + 1);
55
+ }
56
+ const what = mark.draft ? "Draft comment" : mark.count === 1 ? "1 comment" : mark.count > 1 ? mark.count + " comments" : "Comment";
57
+ return words === "" ? what : what + ' on "' + words + '"';
58
+ }`;
59
+
37
60
  /**
38
61
  * The shell's annotation runtime (P053), spliced into the shell's runtime (`__ANNOTATE__`) when
39
62
  * the config declares `annotate`, so it runs before any content does, with the DOM's own
40
63
  * functions as they were. Plain ES2020 like the rest of the shell; no template literals (it sits
41
64
  * in one).
42
65
  *
43
- * The host drives it (`porthole/annotate.start|stop|show|focus|clear|track|clearSelection`) and it
44
- * reports (`porthole/annotate.selected|unselected|cancelled|anchored|activated|tracked`):
66
+ * The host drives it (`porthole/annotate.start|stop|show|focus|clear|track|clearSelection|focusMark`)
67
+ * and it reports (`porthole/annotate.selected|unselected|cancelled|anchored|activated|tracked`):
45
68
  * - picking an element: the element under the pointer (or finger) is outlined with its name; a
46
69
  * click or tap picks it, and the content's own handlers never see that click (unless the content
47
70
  * patched the DOM's built-ins, P105); Escape cancels (while selecting text too, P112);
@@ -51,17 +74,22 @@ export const MARKER_HIT = String.raw`(count, boxAt, x, y, touch) => {
51
74
  * was, its text anywhere, its words with any spacing) and drawn over it, in a layer of the
52
75
  * shell's own (a closed shadow root), again whenever the content changes; what can't be found
53
76
  * is reported `orphaned`;
54
- * - markers (P104): a mark with a count gets a small bubble with the number beside its anchor's
55
- * last line (P105: in the line's gutter); a click on it is reported (`activated`), and the
56
- * content's own handlers never see it; a draft (P107) is drawn apart, a dashed line and a hollow
57
- * bubble with no number, and has a marker with or without a count;
77
+ * - markers (P104): a mark with a count gets a small button with the number, a bubble: a text
78
+ * anchor's at its paragraph's end (P133), a draft's (P107) beside its anchor's last line (P105:
79
+ * in the line's gutter), an element's on its corner; a click on it, or Enter or Space with the
80
+ * focus on it (P133), is reported (`activated`), and the content's own handlers never see it; a
81
+ * draft is drawn apart, a dashed line and a hollow bubble with no number, and has a marker with
82
+ * or without a count; the host's `focusMark` (P134) puts the focus on a marker that is there, and
83
+ * tells nothing back;
58
84
  * - following: while a mark has a marker, once a scroll, a resize or a change of the content
59
85
  * settles, the marks that moved since the host was last told are reported, at most once a
60
86
  * second, so the host's own UI beside a mark can follow;
61
87
  * - places in the document (P132): each result's box also in the document's coordinates
62
88
  * (`documentRect`), with how far the document was scrolled as it was read (`scroll`), and the
63
89
  * followed mark's (`tracked`) too, so a host places marks scrolled out of the frame, and keeps
64
- * them placed as the document scrolls, from one report and the followed mark's scroll.
90
+ * them placed as the document scrolls, from one report and the followed mark's scroll;
91
+ * - the last line (P133): where a selection or a mark's words end, in the document's coordinates
92
+ * too (`lastLineDocumentRect`), so a host places its UI after them.
65
93
  *
66
94
  * It shares the realm with the content, which can interfere with all of it: the host takes its
67
95
  * reports as UI hints only.
@@ -83,6 +111,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
83
111
  track: "porthole/annotate.track",
84
112
  tracked: "porthole/annotate.tracked",
85
113
  clearSelection: "porthole/annotate.clearSelection",
114
+ focusMark: "porthole/annotate.focusMark",
86
115
  };
87
116
  // The DOM's own functions, taken before content runs.
88
117
  const elementFromPoint = Document.prototype.elementFromPoint;
@@ -93,6 +122,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
93
122
  const createElementNS = Document.prototype.createElementNS;
94
123
  const selectionOf = Document.prototype.getSelection;
95
124
  const removeAllRanges = Selection.prototype.removeAllRanges;
125
+ const focusElement = HTMLElement.prototype.focus;
96
126
  const elementRect = Element.prototype.getBoundingClientRect;
97
127
  const rangeRect = Range.prototype.getBoundingClientRect;
98
128
  const rangeRects = Range.prototype.getClientRects;
@@ -323,6 +353,19 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
323
353
  };
324
354
  // A box in the viewport, in the document (P132): where it is as the document scrolls.
325
355
  const inDocument = (rect, scroll) => ({ x: rect.x + scroll.x, y: rect.y + scroll.y, width: rect.width, height: rect.height });
356
+ // Where what was found ends (P133), in the document as a documentRect is: its last line with
357
+ // words on it, or an element's whole box (it has no lines of its own). Null with nothing drawn.
358
+ const lastLineOf = (found, scroll) => {
359
+ const rect = found.range ? lastBox(rangeRects.call(found.range)) : elementRect.call(found.element);
360
+ return rect === null ? null : inDocument(box(rect), scroll);
361
+ };
362
+ // What a selection's report adds to its box (P133): its last line, with the scroll it was
363
+ // read at; neither where nothing of it is drawn.
364
+ const placeOf = (found) => {
365
+ const scroll = scrollOf();
366
+ const lastLineDocumentRect = lastLineOf(found, scroll);
367
+ return lastLineDocumentRect === null ? {} : { lastLineDocumentRect, scroll };
368
+ };
326
369
 
327
370
  // The shell's own layer, over the content: marks, the outline of what would be picked.
328
371
  let layer = null;
@@ -337,18 +380,22 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
337
380
  // marker hollow, a light bubble with a dashed edge and the glyph's outline, no number.
338
381
  // While the last pointer was a finger or a pen (P119), each marker takes the pointer in a
339
382
  // box of at least 44 by 44 px centred on its own (an invisible ::before; 100% is its padding
340
- // box, its border 1 px), so a tap a few px off still lands on the shell's layer.
341
- const STYLE = ".mark{position:absolute;border-radius:2px;background:rgba(250,204,21,.18);box-shadow:inset 0 -2px 0 rgba(234,179,8,.95)}.mark.element{background:rgba(250,204,21,.07);box-shadow:none;outline:2px solid rgba(234,179,8,.9);outline-offset:1px}.mark.active{background:rgba(250,204,21,.26);box-shadow:inset 0 -3px 0 rgb(234,179,8),0 0 0 2px rgba(234,179,8,.45)}.mark.element.active{background:rgba(250,204,21,.12);box-shadow:none;outline-width:3px}.mark.element.quiet{background:rgba(250,204,21,.05);outline:1px solid rgba(234,179,8,.6);outline-offset:2px}.mark.element.quiet.active{background:rgba(250,204,21,.1);outline:2px solid rgba(234,179,8,.9)}.mark.draft{box-sizing:border-box;background:rgba(250,204,21,.08);box-shadow:none;border-bottom:2px dashed rgba(202,138,4,.95)}.mark.draft.active{background:rgba(250,204,21,.16);box-shadow:0 0 0 2px rgba(234,179,8,.45);border-bottom-width:3px}.mark.element.draft{background:rgba(250,204,21,.04);border-bottom:0;outline-style:dashed}.mark.element.draft.active{background:rgba(250,204,21,.08);box-shadow:none;outline-style:dashed}.marker{position:absolute;box-sizing:border-box;height:18px;min-width:18px;display:flex;align-items:center;justify-content:center;gap:3px;margin:0;padding:0 5px;border:1px solid rgba(161,98,7,.6);border-radius:9px 9px 9px 2px;background:#fde68a;color:#422006;box-shadow:0 1px 2px rgba(0,0,0,.3);font:600 11px/16px system-ui,-apple-system,Segoe UI,Roboto,sans-serif;font-style:normal;letter-spacing:0;word-spacing:0;text-transform:none;text-indent:0;text-shadow:none;direction:ltr;writing-mode:horizontal-tb;white-space:nowrap;user-select:none;-webkit-user-select:none;cursor:pointer;pointer-events:auto}.marker:hover{background:#fcd34d}.marker.active{background:#facc15;box-shadow:0 0 0 2px rgba(234,179,8,.55),0 1px 2px rgba(0,0,0,.3)}.marker.compact{padding:0 4px}.marker.draft{border:1px dashed rgb(202,138,4);background:#fffdf5;color:#a16207;box-shadow:0 1px 2px rgba(0,0,0,.2)}.marker.draft:hover{background:#fef9e7}.marker.draft.active{background:#fef3c7;box-shadow:0 0 0 2px rgba(234,179,8,.55),0 1px 2px rgba(0,0,0,.2)}.marker.inert{pointer-events:none}.touch>.marker::before{content:'';position:absolute;left:50%;top:50%;width:max(100% + 2px,44px);height:max(100% + 2px,44px);transform:translate(-50%,-50%)}.marker svg{display:block;width:11px;height:11px;flex:none}.mark.flash{animation:flash 1.8s ease-out}@keyframes flash{from{box-shadow:inset 0 -3px 0 rgb(234,179,8),0 0 0 6px rgba(250,204,21,.6)}}.hover{position:absolute;outline:2px solid #2563eb;outline-offset:1px;background:rgba(37,99,235,.12)}.tag{position:absolute;max-width:70vw;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font:12px/18px ui-monospace,SFMono-Regular,Menlo,monospace;padding:0 6px;border-radius:4px;background:#1e293b;color:#fff}";
383
+ // box, its border 1 px), so a tap a few px off still lands on the shell's layer. A marker is
384
+ // a real button (P133): what a browser gives one is taken off, a ring says it has the focus.
385
+ const STYLE = ".mark{position:absolute;border-radius:2px;background:rgba(250,204,21,.18);box-shadow:inset 0 -2px 0 rgba(234,179,8,.95)}.mark.element{background:rgba(250,204,21,.07);box-shadow:none;outline:2px solid rgba(234,179,8,.9);outline-offset:1px}.mark.active{background:rgba(250,204,21,.26);box-shadow:inset 0 -3px 0 rgb(234,179,8),0 0 0 2px rgba(234,179,8,.45)}.mark.element.active{background:rgba(250,204,21,.12);box-shadow:none;outline-width:3px}.mark.element.quiet{background:rgba(250,204,21,.05);outline:1px solid rgba(234,179,8,.6);outline-offset:2px}.mark.element.quiet.active{background:rgba(250,204,21,.1);outline:2px solid rgba(234,179,8,.9)}.mark.draft{box-sizing:border-box;background:rgba(250,204,21,.08);box-shadow:none;border-bottom:2px dashed rgba(202,138,4,.95)}.mark.draft.active{background:rgba(250,204,21,.16);box-shadow:0 0 0 2px rgba(234,179,8,.45);border-bottom-width:3px}.mark.element.draft{background:rgba(250,204,21,.04);border-bottom:0;outline-style:dashed}.mark.element.draft.active{background:rgba(250,204,21,.08);box-shadow:none;outline-style:dashed}.marker{position:absolute;box-sizing:border-box;height:18px;min-width:18px;display:flex;align-items:center;justify-content:center;gap:3px;margin:0;padding:0 5px;border:1px solid rgba(161,98,7,.6);border-radius:9px 9px 9px 2px;background:#fde68a;color:#422006;box-shadow:0 1px 2px rgba(0,0,0,.3);font:600 11px/16px system-ui,-apple-system,Segoe UI,Roboto,sans-serif;font-style:normal;letter-spacing:0;word-spacing:0;text-transform:none;text-indent:0;text-shadow:none;direction:ltr;writing-mode:horizontal-tb;white-space:nowrap;user-select:none;-webkit-user-select:none;cursor:pointer;pointer-events:auto;appearance:none;-webkit-appearance:none}.marker:focus-visible{outline:2px solid #2563eb;outline-offset:1px}.marker:hover{background:#fcd34d}.marker.active{background:#facc15;box-shadow:0 0 0 2px rgba(234,179,8,.55),0 1px 2px rgba(0,0,0,.3)}.marker.compact{padding:0 4px}.marker.draft{border:1px dashed rgb(202,138,4);background:#fffdf5;color:#a16207;box-shadow:0 1px 2px rgba(0,0,0,.2)}.marker.draft:hover{background:#fef9e7}.marker.draft.active{background:#fef3c7;box-shadow:0 0 0 2px rgba(234,179,8,.55),0 1px 2px rgba(0,0,0,.2)}.marker.inert,[data-placing]>.marker{pointer-events:none}.touch>.marker::before{content:'';position:absolute;left:50%;top:50%;width:max(100% + 2px,44px);height:max(100% + 2px,44px);transform:translate(-50%,-50%)}.marker svg{display:block;width:11px;height:11px;flex:none}.mark.flash{animation:flash 1.8s ease-out}@keyframes flash{from{box-shadow:inset 0 -3px 0 rgb(234,179,8),0 0 0 6px rgba(250,204,21,.6)}}.hover{position:absolute;outline:2px solid #2563eb;outline-offset:1px;background:rgba(37,99,235,.12)}.tag{position:absolute;max-width:70vw;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font:12px/18px ui-monospace,SFMono-Regular,Menlo,monospace;padding:0 6px;border-radius:4px;background:#1e293b;color:#fff}";
342
386
  // Inline and important: the content's own style sheets can't hide, shrink or move it by
343
387
  // accident. Set again at each draw, since its scripts can rewrite it (narrowing only: the
344
- // content can still cover the layer, or move it with its ancestors, P104).
345
- const LAYER_STYLE = "position:fixed!important;inset:0!important;width:auto!important;height:auto!important;min-width:0!important;min-height:0!important;max-width:none!important;max-height:none!important;display:block!important;visibility:visible!important;opacity:1!important;pointer-events:none!important;z-index:2147483647!important;overflow:hidden!important;margin:0!important;padding:0!important;border:0!important;background:none!important;transform:none!important;scale:none!important;translate:none!important;rotate:none!important;zoom:1!important;clip-path:none!important;mask:none!important;filter:none!important;content-visibility:visible!important;contain:none!important";
388
+ // content can still cover the layer, or move it with its ancestors, P104). Clipped, where an
389
+ // engine has it, not hidden: hidden is a box a focused marker out of view would scroll (P133).
390
+ const LAYER_STYLE = "position:fixed!important;inset:0!important;width:auto!important;height:auto!important;min-width:0!important;min-height:0!important;max-width:none!important;max-height:none!important;display:block!important;visibility:visible!important;opacity:1!important;pointer-events:none!important;z-index:2147483647!important;overflow:hidden!important;overflow:clip!important;margin:0!important;padding:0!important;border:0!important;background:none!important;transform:none!important;scale:none!important;translate:none!important;rotate:none!important;zoom:1!important;clip-path:none!important;mask:none!important;filter:none!important;content-visibility:visible!important;contain:none!important";
346
391
  const ensureLayer = () => {
347
392
  if (layer === null) {
348
393
  layer = createElement.call(document, "div");
349
- layer.setAttribute("aria-hidden", "true");
350
394
  layer.setAttribute("data-porthole-annotations", "");
351
395
  shadow = attachShadow.call(layer, { mode: "closed" });
396
+ // Within the shadow root: a focus moving from one marker to the next never leaves it.
397
+ callOf(listenOn, shadow, ["focusin", onMarkerFocus]);
398
+ callOf(listenOn, shadow, ["focusout", onMarkerFocus]);
352
399
  }
353
400
  if (layer.style.cssText !== LAYER_STYLE) {
354
401
  layer.style.cssText = LAYER_STYLE;
@@ -380,6 +427,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
380
427
  const markerWidth = (label) => Math.max(MARKER_HEIGHT, 23 + (label === "" ? 0 : 3 + label.length * 7));
381
428
  // Compact (P105): the number alone, or the glyph alone for none, with less padding.
382
429
  const compactWidth = (label) => (label === "" ? 21 : Math.max(MARKER_HEIGHT, 10 + label.length * 7));
430
+ const nameOf = ${MARKER_NAME};
383
431
  // A rect's last line with words on it: its last box with a width, else any with a size.
384
432
  const lastBox = (rects) => {
385
433
  let any = null;
@@ -403,7 +451,9 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
403
451
  // in a row of them), just past the line's last word. Markers on one line of one block go
404
452
  // together, in the order their words end. Where the bubble with its glyph fits in none of
405
453
  // these, the number alone does (compact); where that fits in none either (a full line on a
406
- // narrow screen), it goes as far right as it can, over the line's end.
454
+ // narrow screen), it goes as far right as it can, over the line's end. A posted comment's
455
+ // marker (P133) is placed the same way on its paragraph's last line instead, where nothing
456
+ // follows its words, and first tries just past that line's last word.
407
457
  const computedOf = window.getComputedStyle;
408
458
  const elementsAt = Document.prototype.elementsFromPoint;
409
459
  const containsOf = Node.prototype.contains;
@@ -463,6 +513,52 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
463
513
  }
464
514
  return end;
465
515
  };
516
+ // The end of the paragraph an anchor ends in (P133): a range over the block's last words
517
+ // that are drawn, from the anchor's end on, as far as a block inside it (a nested list, say:
518
+ // its words are their own paragraph), 256 text nodes at most. Null if none follow the anchor.
519
+ const inBlock = (node, block) => {
520
+ for (let at = node.parentElement; at !== null && at !== block; at = at.parentElement) {
521
+ if (!INLINE.test(computedOf.call(window, at).display)) {
522
+ return false;
523
+ }
524
+ }
525
+ return true;
526
+ };
527
+ const paragraphEnd = (range, block) => {
528
+ const start = range.endContainer;
529
+ if (start.nodeType !== 3) {
530
+ return null;
531
+ }
532
+ const walker = createTreeWalker.call(document, block, NodeFilter.SHOW_TEXT);
533
+ walker.currentNode = start;
534
+ let end = null;
535
+ let node = start;
536
+ for (let pieces = 0; node !== null && pieces < 256; pieces += 1) {
537
+ if (node !== start && !inBlock(node, block)) {
538
+ break;
539
+ }
540
+ const words = node.nodeValue;
541
+ const first = node === start ? range.endOffset : 0;
542
+ let to = words.length;
543
+ while (to > first && /\s/.test(words.charAt(to - 1))) {
544
+ to -= 1;
545
+ }
546
+ if (to > first) {
547
+ const piece = createRange.call(document);
548
+ try {
549
+ piece.setStart(node, Math.max(first, to - 2));
550
+ piece.setEnd(node, to);
551
+ } catch (_) {
552
+ return end;
553
+ }
554
+ if (lastBox(rangeRects.call(piece)) !== null) {
555
+ end = piece;
556
+ }
557
+ }
558
+ node = walker.nextNode();
559
+ }
560
+ return end;
561
+ };
466
562
  // Nothing of the content's at a point but a box that holds the block (its background); a
467
563
  // point out of view hides nothing.
468
564
  const clearAt = (x, y, block) => {
@@ -515,7 +611,11 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
515
611
  return null;
516
612
  };
517
613
  const gutter = right + gap;
518
- let left = fits(gutter, false);
614
+ // A paragraph's end (P133): just past its last word, where the line leaves the room.
615
+ let left = line.ending ? fits(line.words + gap, false) : null;
616
+ if (left === null) {
617
+ left = fits(gutter, false);
618
+ }
519
619
  if (left === null && gutter > most) {
520
620
  left = fits(most, true);
521
621
  }
@@ -527,7 +627,8 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
527
627
  const placeLines = (wanted, placed, room) => {
528
628
  // One line of one block: markers whose last lines share a middle.
529
629
  const lines = [];
530
- wanted.sort((a, b) => a.at.top - b.at.top || a.at.right - b.at.right);
630
+ // In the order their words end, those at one paragraph's end too.
631
+ wanted.sort((a, b) => a.at.top - b.at.top || a.at.right - b.at.right || a.words.top - b.words.top || a.words.right - b.words.right);
531
632
  for (const each of wanted) {
532
633
  const middle = each.at.top + each.at.height / 2;
533
634
  let line = null;
@@ -537,10 +638,11 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
537
638
  }
538
639
  }
539
640
  if (line === null) {
540
- line = { block: each.block, middle, height: each.at.height, bottom: each.at.bottom, range: each.range, at: each.at, items: [] };
641
+ line = { block: each.block, middle, height: each.at.height, bottom: each.at.bottom, range: each.range, at: each.at, ending: false, items: [] };
541
642
  lines.push(line);
542
643
  }
543
644
  line.items.push(each);
645
+ line.ending = line.ending || each.ending;
544
646
  if (each.at.right > line.at.right) {
545
647
  line.at = each.at;
546
648
  line.range = each.range;
@@ -619,20 +721,24 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
619
721
  const kept = markerNodes.get(mark.id);
620
722
  let marker = kept ? kept.element : null;
621
723
  if (marker === null) {
622
- marker = createElement.call(document, "div");
623
- // A listener of its own makes it a thing to tap: WebKit makes a tap a click only on such
624
- // an element (P105, measured: the window's listener isn't enough). It never runs (the
625
- // window's first listener stops every click on the layer); the click is told there.
626
- callOf(listenOn, marker, ["click", tapTarget]);
627
- }
724
+ // A real button (P133): the keyboard reaches it, Enter and Space click it, assistive
725
+ // technology names it, and WebKit makes a tap a click on it (P105).
726
+ marker = createElement.call(document, "button");
727
+ marker.setAttribute("type", "button");
728
+ }
729
+ // Stepped aside while elements are picked, from the keyboard too. Set, not left to the
730
+ // button: Safari's Tab skips a button without one, unless the person asked otherwise.
731
+ marker.tabIndex = mode.elements ? -1 : 0;
628
732
  marker.className = "marker" + (mark.draft ? " draft" : "") + (each.compact ? " compact" : "") + (mark.id === active ? " active" : "") + (mode.elements ? " inert" : "");
629
733
  marker.style.cssText = "left:" + each.left + "px;top:" + each.top + "px";
630
734
  markers.push({ id: mark.id, element: marker });
631
- const form = (mark.draft ? "draft:" : "") + (each.compact ? "compact:" : "full:") + label;
735
+ const name = nameOf(mark);
736
+ const form = (mark.draft ? "draft:" : "") + (each.compact ? "compact:" : "full:") + label + ":" + name;
632
737
  if (kept && kept.form === form) {
633
738
  return marker;
634
739
  }
635
740
  markerNodes.set(mark.id, { element: marker, form });
741
+ marker.setAttribute("aria-label", name);
636
742
  marker.replaceChildren();
637
743
  if (!each.compact || label === "") {
638
744
  const glyph = createElementNS.call(document, SVG, "svg");
@@ -659,10 +765,9 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
659
765
  }
660
766
  return marker;
661
767
  };
662
- const tapTarget = () => {};
663
768
  let active = null;
664
- // The mark whose marker the pointer is over: its words are lit as the active mark's are, so
665
- // a marker in the gutter shows which words it is for (P105).
769
+ // The mark whose marker the pointer is over, or the focus is on (P133): its words are lit as
770
+ // the active mark's are, so a marker in the gutter shows which words it is for (P105).
666
771
  let hot = null;
667
772
  let flashing = null;
668
773
  let flashUntil = 0;
@@ -678,6 +783,10 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
678
783
  style.nonce = nonce;
679
784
  }
680
785
  boxes = { style, marks: createElement.call(document, "div"), markers: createElement.call(document, "div"), hover: createElement.call(document, "div") };
786
+ // Only the markers are for assistive technology (P133): the rest draws what the page
787
+ // already says.
788
+ boxes.marks.setAttribute("aria-hidden", "true");
789
+ boxes.hover.setAttribute("aria-hidden", "true");
681
790
  root.replaceChildren(boxes.style, boxes.marks, boxes.markers, boxes.hover);
682
791
  }
683
792
  if (boxes.style.textContent !== STYLE) {
@@ -699,6 +808,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
699
808
  // What is measured first, then drawn: no node of the layer changes while the page is read.
700
809
  const corners = [];
701
810
  const wanted = [];
811
+ const focused = focusedMarker() !== null;
702
812
  markers = [];
703
813
  for (const mark of marks) {
704
814
  if (mark.found === null) {
@@ -719,14 +829,28 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
719
829
  if (at !== null) {
720
830
  // A draft's marker has no number (P107).
721
831
  const label = mark.draft ? "" : labelOf(mark.count);
722
- const each = { mark, order: corners.length + wanted.length, label, width: markerWidth(label), small: compactWidth(label), compact: false, at, left: 0, top: 0 };
832
+ const each = { mark, label, width: markerWidth(label), small: compactWidth(label), compact: false, at, words: at, left: 0, top: 0, ending: false };
723
833
  if (mark.found.range) {
724
834
  // Kept while it still holds the words (P105): a change elsewhere doesn't move them.
725
835
  if (mark.block === undefined || !mark.block.isConnected || !containsOf.call(mark.block, mark.found.range.endContainer)) {
726
836
  mark.block = blockOf(mark.found.range);
837
+ mark.end = undefined;
727
838
  }
728
839
  each.range = mark.found.range;
729
840
  each.block = mark.block;
841
+ // A posted comment's, at its paragraph's end (P133); read once for what was found,
842
+ // since a block's words can be long. A draft's stays by the words being written on.
843
+ if (!mark.draft) {
844
+ each.ending = true;
845
+ if (mark.end === undefined) {
846
+ mark.end = paragraphEnd(mark.found.range, mark.block);
847
+ }
848
+ const last = mark.end === null ? null : lastBox(rangeRects.call(mark.end));
849
+ if (last !== null) {
850
+ each.at = last;
851
+ each.range = mark.end;
852
+ }
853
+ }
730
854
  wanted.push(each);
731
855
  } else {
732
856
  corners.push(each);
@@ -742,18 +866,25 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
742
866
  }
743
867
  // The layer's own boxes out of the way while places are hit-tested (P105): each test
744
868
  // otherwise walks every mark and marker the last draw left (0.13 ms each, 300 of them).
869
+ // A marker with the focus would lose it out of the display (P133): while the person is on
870
+ // one, the markers only stop taking the pointer, which the tests skip but still walk.
745
871
  if (wanted.length > 0) {
746
872
  into.marks.style.display = "none";
747
- into.markers.style.display = "none";
873
+ if (focused) {
874
+ into.markers.setAttribute("data-placing", "");
875
+ } else {
876
+ into.markers.style.display = "none";
877
+ }
748
878
  try {
749
879
  placeLines(wanted, placed, room);
750
880
  } finally {
751
881
  into.marks.style.display = "";
752
882
  into.markers.style.display = "";
883
+ into.markers.removeAttribute("data-placing");
753
884
  }
754
885
  }
755
886
  const badges = [];
756
- for (const each of corners.concat(wanted).sort((a, b) => a.order - b.order)) {
887
+ for (const each of corners.concat(wanted).sort((a, b) => a.mark.reading - b.mark.reading)) {
757
888
  badges.push(markerOf(each));
758
889
  }
759
890
  for (const id of Array.from(markerNodes.keys())) {
@@ -779,11 +910,14 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
779
910
  into.markers.removeChild(child);
780
911
  }
781
912
  }
782
- for (const badge of badges) {
783
- if (badge.parentNode !== into.markers) {
784
- into.markers.appendChild(badge);
913
+ // In reading order, the Tab key's (P133). A marker that stays in its place isn't touched
914
+ // (a press spans a redraw, above), and none moves while one has the focus: it would lose it.
915
+ badges.forEach((badge, at) => {
916
+ const there = into.markers.childNodes[at] || null;
917
+ if (badge.parentNode !== into.markers || (!focused && there !== badge)) {
918
+ into.markers.insertBefore(badge, focused ? null : there);
785
919
  }
786
- }
920
+ });
787
921
  into.hover.replaceChildren(...outlines);
788
922
  };
789
923
  let drawing = false;
@@ -819,7 +953,8 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
819
953
  // Its box moves as the document scrolls, inside the frame or not: each one tells the
820
954
  // host the scroll, for every mark it places by its place in the document (P132).
821
955
  const scroll = scrollOf();
822
- tell(M.tracked, { id: tracking, rect, documentRect: inDocument(rect, scroll), scroll });
956
+ const lastLineDocumentRect = lastLineOf(mark.found, scroll);
957
+ tell(M.tracked, Object.assign({ id: tracking, rect, documentRect: inDocument(rect, scroll), scroll }, lastLineDocumentRect === null ? {} : { lastLineDocumentRect }));
823
958
  }
824
959
  }
825
960
  trackFrame = nextFrame(trackTick);
@@ -863,15 +998,16 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
863
998
  placed.forEach((each, at) => orders.set(each.mark, at));
864
999
  return orders;
865
1000
  };
866
- // A mark's result: its box in the viewport, and in the document (P132) by scroll, the
867
- // report's one reading of it.
1001
+ // A mark's result: its box in the viewport, and in the document (P132), its last line too
1002
+ // (P133), by scroll, the report's one reading of it.
868
1003
  const resultOf = (mark, orders, scroll) => {
869
1004
  if (mark.found === null) {
870
1005
  return { id: mark.id, state: "orphaned" };
871
1006
  }
872
1007
  const order = (orders || ordersOf()).get(mark);
873
1008
  const rect = box(rectOf(mark.found));
874
- return Object.assign({ id: mark.id, state: "attached", rect, documentRect: inDocument(rect, scroll) }, order === undefined ? {} : { order });
1009
+ const lastLineDocumentRect = lastLineOf(mark.found, scroll);
1010
+ return Object.assign({ id: mark.id, state: "attached", rect, documentRect: inDocument(rect, scroll) }, lastLineDocumentRect === null ? {} : { lastLineDocumentRect }, order === undefined ? {} : { order });
875
1011
  };
876
1012
  // Two boxes more than 0.5 px apart on any side (or one of them unknown).
877
1013
  const apart = (a, b) => !a || !b || Math.abs(a.x - b.x) > 0.5 || Math.abs(a.y - b.y) > 0.5 || Math.abs(a.width - b.width) > 0.5 || Math.abs(a.height - b.height) > 0.5;
@@ -913,8 +1049,15 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
913
1049
  changed = true;
914
1050
  }
915
1051
  mark.found = found;
1052
+ mark.end = undefined;
916
1053
  mark.state = state;
917
1054
  }
1055
+ // Where each starts, once for each finding: the markers' reading order (P133).
1056
+ const orders = ordersOf();
1057
+ for (const mark of marks) {
1058
+ const reading = orders.get(mark);
1059
+ mark.reading = reading === undefined ? marks.length : reading;
1060
+ }
918
1061
  if (all || changed) {
919
1062
  const scroll = scrollOf();
920
1063
  report(resultsOf(false, scroll), scroll);
@@ -931,6 +1074,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
931
1074
  // mark), nor before a run of changes settles; a focus asked for meanwhile waits for it.
932
1075
  let waitingForContent = false;
933
1076
  let pendingFocus = null;
1077
+ let pendingMarker = null;
934
1078
  const settling = () => anchorTimer !== 0 || waitingForContent || marks.some((mark) => mark.state === null);
935
1079
  const scheduleAnchor = (all) => {
936
1080
  if (all) {
@@ -969,6 +1113,11 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
969
1113
  pendingFocus = null;
970
1114
  focus(id);
971
1115
  }
1116
+ if (pendingMarker !== null) {
1117
+ const id = pendingMarker;
1118
+ pendingMarker = null;
1119
+ focusMark(id);
1120
+ }
972
1121
  }, wait);
973
1122
  };
974
1123
  new MutationObserver((records) => {
@@ -1073,11 +1222,33 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1073
1222
  report([{ mark, result: resultOf(mark, null, scroll) }], scroll);
1074
1223
  };
1075
1224
 
1225
+ // The focus on a mark's marker, at the host's word (P134). Marks a show just replaced have no
1226
+ // markers yet, so it waits for them, as focus does; then a marker that isn't there, or has
1227
+ // stepped aside for picking, is nothing to do. The kept function, so a page that patched
1228
+ // focus isn't handed the marker from inside the closed root. The shell's focus listener
1229
+ // lights it and brings it into view; nothing is told.
1230
+ const focusMark = (id) => {
1231
+ if (settling()) {
1232
+ pendingMarker = id;
1233
+ return;
1234
+ }
1235
+ if (mode.elements || !isShown(id)) {
1236
+ return;
1237
+ }
1238
+ for (let i = 0; i < markers.length; i += 1) {
1239
+ if (markers[i].id === id) {
1240
+ callOf(focusElement, markers[i].element, [{ preventScroll: true }]);
1241
+ return;
1242
+ }
1243
+ }
1244
+ };
1245
+
1076
1246
  // A marker's click (P104). The layer takes no pointer but on its markers, so a press whose
1077
1247
  // target is the layer is on a marker: the content's handlers never see it (this listener
1078
- // runs before any of theirs), nor does what lies under it, and a click is reported. No tab
1079
- // stop, by choice: it would join the page's focus order, which the content controls, and the
1080
- // layer is hidden from assistive technology; the host's own list of marks is the keyboard way.
1248
+ // runs before any of theirs), nor does what lies under it, and a click is reported. A press
1249
+ // of the mouse or a finger moves no focus; the keyboard reaches a marker as any button
1250
+ // (P133, which reverses P104's no tab stop): it joins the page's focus order, which the
1251
+ // content controls, so the host's own list of marks stays the keyboard way it can rely on.
1081
1252
  //
1082
1253
  // A press is read and stopped through the platform's own functions and getters, kept now
1083
1254
  // (P105), as the navigation guard reads its events (P099): content that later patches
@@ -1090,6 +1261,11 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1090
1261
  const targetOf = getterOf(Event.prototype, "target");
1091
1262
  const typeOf = getterOf(Event.prototype, "type");
1092
1263
  const buttonOf = getterOf(MouseEvent.prototype, "button");
1264
+ const detailOf = getterOf(UIEvent.prototype, "detail");
1265
+ const keyOf = getterOf(KeyboardEvent.prototype, "key");
1266
+ const repeatOf = getterOf(KeyboardEvent.prototype, "repeat");
1267
+ const activeOf = getterOf(ShadowRoot.prototype, "activeElement");
1268
+ const scrollWindow = window.scrollBy;
1093
1269
  const clientXOf = getterOf(MouseEvent.prototype, "clientX");
1094
1270
  const clientYOf = getterOf(MouseEvent.prototype, "clientY");
1095
1271
  const leftOf = getterOf(DOMRectReadOnly.prototype, "left");
@@ -1106,6 +1282,16 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1106
1282
  const at = markerHit(markers.length, (i) => markerBox(markers[i].element), x, y, touch);
1107
1283
  return at < 0 ? null : markers[at];
1108
1284
  };
1285
+ const markerOfNode = (element) => {
1286
+ for (let i = 0; i < markers.length; i += 1) {
1287
+ if (markers[i].element === element) {
1288
+ return markers[i];
1289
+ }
1290
+ }
1291
+ return null;
1292
+ };
1293
+ // The marker with the focus (P133), or null.
1294
+ const focusedMarker = () => (shadow === null || activeOf === null ? null : markerOfNode(callOf(activeOf, shadow, [])));
1109
1295
  const isShown = (id) => {
1110
1296
  for (let i = 0; i < marks.length; i += 1) {
1111
1297
  if (marks[i].id === id) {
@@ -1135,12 +1321,57 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1135
1321
  }
1136
1322
  // isTrusted is the event's own, unforgeable.
1137
1323
  if (type === "click" && event.isTrusted && callOf(buttonOf, event, []) === 0) {
1324
+ // From the keyboard or assistive technology (P133) a click has no count and no place:
1325
+ // it is the focused marker's. Not while elements are picked: the markers step aside.
1326
+ const keyed = callOf(detailOf, event, []) === 0 ? focusedMarker() : null;
1327
+ if (keyed !== null) {
1328
+ if (!mode.elements && isShown(keyed.id)) {
1329
+ tell(M.activated, { id: keyed.id, rect: markerBox(keyed.element) });
1330
+ }
1331
+ return;
1332
+ }
1138
1333
  const hit = markerAt(callOf(clientXOf, event, []), callOf(clientYOf, event, []));
1139
1334
  if (hit !== null && isShown(hit.id)) {
1140
1335
  tell(M.activated, { id: hit.id, rect: markerBox(hit.element) });
1141
1336
  }
1142
1337
  }
1143
1338
  };
1339
+ // The keys that click a focused marker (P133), each stopped as a press is, so the content
1340
+ // neither hears them nor cancels the click they make; it keeps every other key, Tab and
1341
+ // Escape too, as it would on a button of its own, and the host's find shortcut stays. A key
1342
+ // held down clicks once: each repeat would spend the bridge's rate on one press.
1343
+ const onMarkerKey = (event) => {
1344
+ if (layer === null || callOf(targetOf, event, []) !== layer) {
1345
+ return;
1346
+ }
1347
+ const key = callOf(keyOf, event, []);
1348
+ if (key === "Enter" || key === " ") {
1349
+ callOf(stopPress, event, []);
1350
+ if (callOf(repeatOf, event, [])) {
1351
+ callOf(cancelPress, event, []);
1352
+ }
1353
+ }
1354
+ };
1355
+ for (const type of ["keydown", "keypress", "keyup"]) {
1356
+ window.addEventListener(type, onMarkerKey, true);
1357
+ }
1358
+ // The focus on a marker (P133) lights its words, as the pointer does, and brings it into view:
1359
+ // a marker out of view is out of the layer's box, which never scrolls, so the document must.
1360
+ const onMarkerFocus = (event) => {
1361
+ const on = callOf(typeOf, event, []) === "focusin" ? markerOfNode(callOf(targetOf, event, [])) : null;
1362
+ const id = on === null ? null : on.id;
1363
+ if (id !== hot) {
1364
+ hot = id;
1365
+ redraw();
1366
+ }
1367
+ if (on !== null) {
1368
+ const rect = markerBox(on.element);
1369
+ const seen = document.documentElement.clientHeight || window.innerHeight;
1370
+ if (rect.y < 0 || rect.y + rect.height > seen) {
1371
+ callOf(scrollWindow, window, [0, rect.y - (seen - rect.height) / 2]);
1372
+ }
1373
+ }
1374
+ };
1144
1375
  // The pointer moving over a marker is stopped too. Narrowing only: the content still sees
1145
1376
  // the pointer leave its own element for the layer (relatedTarget), the layer's :hover and
1146
1377
  // :active, and the frame's user activation, so it can tell a marker was pressed, and
@@ -1260,7 +1491,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1260
1491
  return;
1261
1492
  }
1262
1493
  swallowUntil = performance.now() + 2000;
1263
- tell(M.selected, { anchor, rect: box(elementRect.call(element)) });
1494
+ tell(M.selected, Object.assign({ anchor, rect: box(elementRect.call(element)) }, placeOf({ element })));
1264
1495
  }, HOLD_MS),
1265
1496
  };
1266
1497
  }, true);
@@ -1308,7 +1539,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1308
1539
  hover = null;
1309
1540
  setCursor(false);
1310
1541
  draw();
1311
- tell(M.selected, { anchor, rect: box(elementRect.call(element)) });
1542
+ tell(M.selected, Object.assign({ anchor, rect: box(elementRect.call(element)) }, placeOf({ element })));
1312
1543
  }, true);
1313
1544
  window.addEventListener("keydown", (event) => {
1314
1545
  if (event.key !== "Escape") {
@@ -1367,7 +1598,7 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1367
1598
  }
1368
1599
  reported = key;
1369
1600
  reportedBox = rect;
1370
- tell(M.selected, { anchor, rect });
1601
+ tell(M.selected, Object.assign({ anchor, rect }, placeOf({ range })));
1371
1602
  return true;
1372
1603
  };
1373
1604
  document.addEventListener("selectionchange", () => {
@@ -1446,9 +1677,13 @@ export const ANNOTATE_RUNTIME = String.raw`if (declared("annotate")) {
1446
1677
  }
1447
1678
  break;
1448
1679
  }
1680
+ case M.focusMark:
1681
+ focusMark(String(params.id));
1682
+ break;
1449
1683
  case M.clear:
1450
1684
  track(null);
1451
1685
  pendingFocus = null;
1686
+ pendingMarker = null;
1452
1687
  marks = [];
1453
1688
  active = null;
1454
1689
  hot = null;
package/src/shell/find.ts CHANGED
@@ -140,7 +140,7 @@ export const FIND_LATEST = String.raw`(later, time, quiet, run, superseded) => {
140
140
  * scripts can, P104). The annotation runtime carries the same text (a test holds them equal).
141
141
  */
142
142
  export const LAYER_STYLE =
143
- "position:fixed!important;inset:0!important;width:auto!important;height:auto!important;min-width:0!important;min-height:0!important;max-width:none!important;max-height:none!important;display:block!important;visibility:visible!important;opacity:1!important;pointer-events:none!important;z-index:2147483647!important;overflow:hidden!important;margin:0!important;padding:0!important;border:0!important;background:none!important;transform:none!important;scale:none!important;translate:none!important;rotate:none!important;zoom:1!important;clip-path:none!important;mask:none!important;filter:none!important;content-visibility:visible!important;contain:none!important";
143
+ "position:fixed!important;inset:0!important;width:auto!important;height:auto!important;min-width:0!important;min-height:0!important;max-width:none!important;max-height:none!important;display:block!important;visibility:visible!important;opacity:1!important;pointer-events:none!important;z-index:2147483647!important;overflow:hidden!important;overflow:clip!important;margin:0!important;padding:0!important;border:0!important;background:none!important;transform:none!important;scale:none!important;translate:none!important;rotate:none!important;zoom:1!important;clip-path:none!important;mask:none!important;filter:none!important;content-visibility:visible!important;contain:none!important";
144
144
 
145
145
  /**
146
146
  * The shell's find in page (P131), spliced into the shell's runtime (`__FIND__`) when the config