@soomo/text-annotator 3.4.0-staging.3 → 3.4.1-staging.0

package/dist/text-annotator.es.js

@@ -1,31 +1,31 @@
-import { UAParser as ut } from "ua-parser-js";
-import { OS as ft } from "ua-parser-js/enums";
+import { UAParser as ft } from "ua-parser-js";
+import { OS as ut } from "ua-parser-js/enums";
 import $ from "debounce";
-import { colord as ot } from "colord";
+import { colord as Z } from "colord";
 import { dequal as gt } from "dequal/lite";
 import { v4 as st } from "uuid";
-import { serializeW3CBodies as mt, parseW3CBodies as pt, parseW3CUser as ht, createStore as yt, createSelectionState as bt, createHoverState as St, createViewportState as Ct, Origin as F, createAnonymousGuest as Et, createUndoStack as wt, createLifecycleObserver as At, createBaseAnnotator as vt } from "@annotorious/core";
+import { serializeW3CBodies as mt, parseW3CBodies as pt, parseW3CUser as ht, createStore as bt, createSelectionState as yt, createHoverState as St, createViewportState as Ct, Origin as K, createAnonymousGuest as Et, createUndoStack as wt, createLifecycleObserver as At, createBaseAnnotator as vt } from "@annotorious/core";
 import { Origin as He, UserSelectAction as Pe, createBody as _e } from "@annotorious/core";
 import xt from "rbush";
-import { createNanoEvents as Rt } from "nanoevents";
-import X from "hotkeys-js";
-import { poll as Tt } from "poll";
-const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
+import { createNanoEvents as Tt } from "nanoevents";
+import Y from "hotkeys-js";
+import { poll as Rt } from "poll";
+const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   var r;
   return t.contains(e) ? !!(e instanceof HTMLElement ? e.closest(W) : (r = e.parentElement) == null ? void 0 : r.closest(W)) : !0;
 }, Lt = (t, e) => {
   const n = e.commonAncestorContainer;
-  return !K(t, n);
+  return !z(t, n);
 }, Nt = (t) => t.addEventListener("click", (e) => {
   // Allow clicks within not-annotatable elements
   !e.target.closest(W) && !e.target.closest("a") && e.preventDefault();
-}), Ot = ut(), kt = Ot.os.is(ft.MACOS), Bt = (t) => {
+}), Ot = ft(), kt = Ot.os.is(ut.MACOS), Bt = (t) => {
   !t.hasAttribute("tabindex") && t.tabIndex < 0 && t.setAttribute("tabindex", "-1"), t.classList.add("no-focus-outline");
-}, It = (t) => {
+}, it = /^\s*$/, It = (t) => it.test(t.toString()), Mt = (t) => it.test(t.textContent || ""), Ht = (t) => {
   const e = [], n = document.createNodeIterator(t.commonAncestorContainer, NodeFilter.SHOW_TEXT);
   let r;
   for (; r = n.nextNode(); )
-    t.intersectsNode(r) && e.push(r);
+    t.intersectsNode(r) && !Mt(r) && e.push(r);
   if (e.length < 2)
     return Array.from(t.getClientRects());
   {
@@ -33,9 +33,9 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     i.selectNode(o), t.startContainer.nodeType === Node.TEXT_NODE ? i.setStart(o, t.startOffset) : i.setStartAfter(t.startContainer);
     const c = document.createRange();
     c.selectNode(s), t.endContainer.nodeType === Node.TEXT_NODE ? c.setEnd(s, t.endOffset) : c.setEndBefore(t.endContainer);
-    const l = (f) => {
+    const l = (u) => {
       const p = document.createRange();
-      return p.selectNode(f), Array.from(p.getClientRects());
+      return p.selectNode(u), Array.from(p.getClientRects());
     };
     return [
       ...Array.from(i.getClientRects()),
@@ -43,7 +43,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
       ...Array.from(c.getClientRects())
     ];
   }
-}, Mt = function* (t) {
+}, Pt = function* (t) {
   const e = document.createNodeIterator(
     t.commonAncestorContainer,
     NodeFilter.SHOW_ELEMENT,
@@ -52,11 +52,11 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   let n;
   for (; n = e.nextNode(); )
     n instanceof HTMLElement && (yield n);
-}, Ht = (t, e) => {
+}, _t = (t, e) => {
   if (!Lt(t, e)) return [];
   const n = [];
   let r = null;
-  for (const o of Mt(e)) {
+  for (const o of Pt(e)) {
     let s;
     r ? (s = document.createRange(), s.setStartAfter(r), s.setEndBefore(o)) : (s = e.cloneRange(), s.setEndBefore(o)), s.collapsed || n.push(s), r = o;
   }
@@ -65,20 +65,20 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     o.setStartAfter(r), o.collapsed || n.push(o);
   }
   return n.length > 0 ? n : [e];
-}, Z = (t) => {
+}, J = (t) => {
   const e = t.cloneContents();
   return e.querySelectorAll(W).forEach((n) => n.remove()), e;
-}, Pt = (t, e, n = 10, r) => {
+}, Dt = (t, e, n = 10, r) => {
   const o = r ? t.startContainer.parentElement.closest(r) : e, s = document.createRange();
   s.setStart(o, 0), s.setEnd(t.startContainer, t.startOffset);
-  const i = Z(s).textContent, c = document.createRange();
+  const i = J(s).textContent, c = document.createRange();
   c.setStart(t.endContainer, t.endOffset), o === document.body ? c.setEnd(o, o.childNodes.length) : c.setEndAfter(o);
-  const l = Z(c).textContent;
+  const l = J(c).textContent;
   return {
     prefix: i.substring(i.length - n),
     suffix: l.substring(0, n)
   };
-}, P = (t) => t.every((e) => e.range instanceof Range && !e.range.collapsed), _t = /^\s*$/, Dt = (t) => _t.test(t.toString()), Ut = (t, e, n, r) => {
+}, P = (t) => t.every((e) => e.range instanceof Range && !e.range.collapsed), Ut = (t, e, n, r) => {
   const o = (c) => Math.round(c * 10) / 10, s = {
     top: o(t.top),
     bottom: o(t.bottom),
@@ -112,16 +112,16 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   for (const c of r) {
     const l = Ut(o, c, e, n);
     if (l === "inline-adjacent") {
-      s = s.map((f) => f === c ? Ft(o, c) : f), i = !0;
+      s = s.map((u) => u === c ? Ft(o, c) : u), i = !0;
       break;
     } else if (l === "inline-contains") {
-      s = s.map((f) => f === c ? o : f), i = !0;
+      s = s.map((u) => u === c ? o : u), i = !0;
       break;
     } else if (l === "inline-is-contained") {
       i = !0;
       break;
     } else if (l === "block-contains" || l === "block-is-contained") {
-      o.width < c.width && (s = s.map((f) => f === c ? o : f)), o.width === c.width && o.height < c.width && (s = s.map((f) => f === c ? o : f)), i = !0;
+      o.width < c.width && (s = s.map((u) => u === c ? o : u)), o.width === c.width && o.height < c.width && (s = s.map((u) => u === c ? o : u)), i = !0;
       break;
     }
   }
@@ -136,10 +136,10 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
 }), $t = (t, e, n) => {
   const r = document.createRange(), o = n ? t.startContainer.parentElement.closest(n) : e;
   r.setStart(o, 0), r.setEnd(t.startContainer, t.startOffset);
-  const s = Z(r).textContent, i = t.toString(), c = s.length || 0, l = c + i.length;
+  const s = J(r).textContent, i = t.toString(), c = s.length || 0, l = c + i.length;
   return n ? { quote: i, start: c, end: l, range: t, offsetReference: o } : { quote: i, start: c, end: l, range: t };
-}, it = (t, e) => {
-  var p, u;
+}, at = (t, e) => {
+  var p, f;
   const { start: n, end: r } = t, o = t.offsetReference || e, s = document.createNodeIterator(
     e,
     NodeFilter.SHOW_TEXT,
@@ -152,9 +152,9 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   const c = document.createRange();
   let l = s.nextNode();
   l === null && console.error("Could not revive annotation target. Content missing.");
-  let f = !o;
+  let u = !o;
   for (; l !== null; ) {
-    if (f || (f = typeof (o == null ? void 0 : o.contains) == "function" ? o.contains(l) : !1), f) {
+    if (u || (u = typeof (o == null ? void 0 : o.contains) == "function" ? o.contains(l) : !1), u) {
       const g = ((p = l.textContent) == null ? void 0 : p.length) || 0;
       if (i + g > n) {
         c.setStart(l, n - i);
@@ -165,7 +165,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     l = s.nextNode();
   }
   for (; l !== null; ) {
-    const g = ((u = l.textContent) == null ? void 0 : u.length) || 0;
+    const g = ((f = l.textContent) == null ? void 0 : f.length) || 0;
     if (i + g >= r) {
       c.setEnd(l, r - i);
       break;
@@ -178,20 +178,10 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   };
 }, q = (t, e) => P(t.selector) ? t : {
   ...t,
-  selector: t.selector.map((n) => n.range instanceof Range && !n.range.collapsed ? n : it(n, e))
-}, G = (t, e) => P(t.target.selector) ? t : { ...t, target: q(t.target, e) }, at = (t, e) => {
-  if (t.isEqualNode(e))
-    return !0;
-  for (let n of t.childNodes)
-    if (at(n, e))
-      return !0;
-  return !1;
-}, Wt = (t, e) => {
-  const n = t.cloneContents();
-  return at(n, e);
-}, Vt = (t, e) => {
-  const n = t.cloneRange(), r = e.contains(n.startContainer), o = e.contains(n.endContainer);
-  return !r && !o && !Wt(n, e) ? (n.collapse(), n) : (r || n.setStart(e, 0), o || n.setEnd(e, e.childNodes.length), n);
+  selector: t.selector.map((n) => n.range instanceof Range && !n.range.collapsed ? n : at(n, e))
+}, G = (t, e) => P(t.target.selector) ? t : { ...t, target: q(t.target, e) }, Wt = (t, e) => {
+  const n = t.cloneRange();
+  return e.contains(n.startContainer) || n.setStart(e, 0), e.contains(n.endContainer) || n.setEnd(e, e.childNodes.length), n;
 }, Q = (t) => ({
   ...t,
   type: t.type,
@@ -218,7 +208,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   pointerId: t.pointerId,
   pointerType: t.pointerType,
   timeStamp: t.timeStamp
-}), z = (t) => ({
+}), X = (t) => ({
   ...t,
   type: t.type,
   key: t.key,
@@ -234,7 +224,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   defaultPrevented: t.defaultPrevented,
   detail: t.detail,
   timeStamp: t.timeStamp
-}), Yt = (t, e) => {
+}), Vt = (t, e) => {
   const { left: n, top: r, right: o, bottom: s } = t;
   return new DOMRect(n - e.left, r - e.top, o - n, s - r);
 }, Oe = (t, e) => {
@@ -245,10 +235,10 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     return document.scrollingElement;
   const { overflowY: e } = window.getComputedStyle(t);
   return e !== "visible" && e !== "hidden" && t.scrollHeight > t.clientHeight ? t : ct(t.parentElement);
-}, tt = (t, e, n) => {
-  const r = n.getBoundingClientRect(), o = n.clientHeight, s = n.clientWidth, i = e.selector[0].range.getBoundingClientRect(), { width: c, height: l } = t.getAnnotationBounds(e.annotation), f = i.top - r.top, p = i.left - r.left, u = n.parentElement ? n.scrollTop : 0, g = n.parentElement ? n.scrollLeft : 0, d = f + u - (o - l) / 2, L = p + g - (s - c) / 2;
+}, et = (t, e, n) => {
+  const r = n.getBoundingClientRect(), o = n.clientHeight, s = n.clientWidth, i = e.selector[0].range.getBoundingClientRect(), { width: c, height: l } = t.getAnnotationBounds(e.annotation), u = i.top - r.top, p = i.left - r.left, f = n.parentElement ? n.scrollTop : 0, g = n.parentElement ? n.scrollLeft : 0, d = u + f - (o - l) / 2, L = p + g - (s - c) / 2;
   n.scroll({ top: d, left: L, behavior: "smooth" });
-}, Xt = (t, e) => (n, r) => {
+}, Yt = (t, e) => (n, r) => {
   const o = typeof n == "string" ? n : n.id, s = r ? typeof r == "string" ? document.getElementById(r) : r : ct(t);
   if (!s)
     return console.warn(`The scroll parent is missing for the annotation: ${o}`, { container: t }), !1;
@@ -257,59 +247,59 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     return console.warn(`The annotation is missing in the store: ${o}`), !1;
   const { range: c } = i.target.selector[0];
   if (c && !c.collapsed)
-    return tt(e, i.target, s), !0;
-  const l = q(i.target, t), { range: f } = l.selector[0];
-  return f && !f.collapsed ? (tt(e, l, s), !0) : !1;
+    return et(e, i.target, s), !0;
+  const l = q(i.target, t), { range: u } = l.selector[0];
+  return u && !u.collapsed ? (et(e, l, s), !0) : !1;
 }, _ = {
   fill: "rgb(0, 128, 255)",
   fillOpacity: 0.18
 }, j = {
   fill: "rgb(0, 128, 255)",
   fillOpacity: 0.45
-}, zt = (t, e, n, r, o) => {
+}, Xt = (t, e, n, r, o) => {
   var i, c;
   const s = n ? typeof n == "function" ? n(t.annotation, t.state, o) || ((i = t.state) != null && i.selected ? j : _) : n : (c = t.state) != null && c.selected ? j : _;
   return r && r.paint(t, e) || s;
-}, qt = (t) => {
+}, zt = (t) => {
   const { top: e, left: n } = t.getBoundingClientRect(), { innerWidth: r, innerHeight: o } = window, s = -n, i = -e, c = r - n, l = o - e;
   return { top: e, left: n, minX: s, minY: i, maxX: c, maxY: l };
-}, jt = (t) => {
+}, qt = (t) => {
   let e = /* @__PURE__ */ new Set();
   return (r) => {
     const o = r.map((s) => s.id);
     (e.size !== o.length || o.some((s) => !e.has(s))) && t.set(o), e = new Set(o);
   };
-}, J = (t, e, n, r) => {
+}, tt = (t, e, n, r) => {
   const { store: o, selection: s, hover: i } = e;
-  let c, l, f;
-  const p = jt(n), u = $((S) => {
-    const { x, y: T } = t.getBoundingClientRect(), k = o.getAt(S.clientX - x, S.clientY - T, !1, l);
-    k ? i.current !== k.id && (t.classList.add("hovered"), i.set(k.id)) : i.current && (t.classList.remove("hovered"), i.set(null));
+  let c, l, u;
+  const p = qt(n), f = $((S) => {
+    const { x: A, y: T } = t.getBoundingClientRect(), B = o.getAt(S.clientX - A, S.clientY - T, !1, l);
+    B ? i.current !== B.id && (t.classList.add("hovered"), i.set(B.id)) : i.current && (t.classList.remove("hovered"), i.set(null));
   }, 10);
-  t.addEventListener("pointermove", u);
+  t.addEventListener("pointermove", f);
   const g = $((S = !1) => requestAnimationFrame(() => {
-    f && f.clear();
-    const x = qt(t), { minX: T, minY: k, maxX: y, maxY: v } = x, I = l ? o.getIntersecting(T, k, y, v).filter(({ annotation: O }) => l(O)) : o.getIntersecting(T, k, y, v), V = s.selected.map(({ id: O }) => O), M = I.map(({ annotation: O, rects: H }) => {
-      const B = V.includes(O.id), D = O.id === i.current;
+    u && u.clear();
+    const A = zt(t), { minX: T, minY: B, maxX: y, maxY: v } = A, I = l ? o.getIntersecting(T, B, y, v).filter(({ annotation: O }) => l(O)) : o.getIntersecting(T, B, y, v), D = s.selected.map(({ id: O }) => O), M = I.map(({ annotation: O, rects: H }) => {
+      const k = D.includes(O.id), U = O.id === i.current;
       return {
         annotation: O,
         rects: H,
-        state: { selected: B, hovered: D }
+        state: { selected: k, hovered: U }
       };
     });
-    r.redraw(M, x, c, f, S), setTimeout(() => p(I.map(({ annotation: O }) => O)), 1);
+    r.redraw(M, A, c, u, S), setTimeout(() => p(I.map(({ annotation: O }) => O)), 1);
   }), 10), d = (S) => {
-    f = S, g();
+    u = S, g();
   }, L = (S) => {
     c = S, g();
   }, w = (S) => {
     l = S, g(!1);
-  }, R = () => g();
-  o.observe(R);
-  const A = s.subscribe(() => g()), C = i.subscribe(() => g()), N = () => g(!0);
+  }, x = () => g();
+  o.observe(x);
+  const R = s.subscribe(() => g()), C = i.subscribe(() => g()), N = () => g(!0);
   document.addEventListener("scroll", N, { capture: !0, passive: !0 });
   const E = $(() => {
-    o.recalculatePositions(), f == null || f.reset(), g();
+    o.recalculatePositions(), u == null || u.reset(), g();
   }, 10);
   window.addEventListener("resize", E);
   const a = new ResizeObserver(E);
@@ -319,7 +309,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   }, 150));
   return b.observe(document.body, m), {
     destroy: () => {
-      t.removeEventListener("pointermove", u), r.destroy(), o.unobserve(R), A(), C(), document.removeEventListener("scroll", N), E.clear(), window.removeEventListener("resize", E), a.disconnect(), b.disconnect();
+      t.removeEventListener("pointermove", f), r.destroy(), o.unobserve(x), R(), C(), document.removeEventListener("scroll", N), E.clear(), window.removeEventListener("resize", E), a.disconnect(), b.disconnect();
     },
     redraw: g,
     setStyle: L,
@@ -327,25 +317,25 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     setPainter: d,
     setVisible: r.setVisible
   };
-}, Gt = () => {
+}, jt = () => {
   const t = document.createElement("canvas");
   return t.width = window.innerWidth, t.height = window.innerHeight, t.className = "r6o-canvas-highlight-layer bg", t;
-}, Qt = (t, e) => {
+}, Gt = (t, e) => {
   t.width = window.innerWidth, t.height = window.innerHeight;
-}, Zt = (t) => {
+}, Qt = (t) => {
   t.classList.add("r6o-annotatable");
-  const e = Gt(), n = e.getContext("2d");
+  const e = jt(), n = e.getContext("2d");
   document.body.appendChild(e);
-  const r = (c, l, f, p) => requestAnimationFrame(() => {
-    const { width: u, height: g } = e;
-    n.clearRect(-0.5, -0.5, u + 1, g + 1), p && p.clear();
+  const r = (c, l, u, p) => requestAnimationFrame(() => {
+    const { width: f, height: g } = e;
+    n.clearRect(-0.5, -0.5, f + 1, g + 1), p && p.clear();
     const { top: d, left: L } = l;
-    [...c].sort((R, A) => {
-      const { annotation: { target: { created: C } } } = R, { annotation: { target: { created: N } } } = A;
+    [...c].sort((x, R) => {
+      const { annotation: { target: { created: C } } } = x, { annotation: { target: { created: N } } } = R;
       return C.getTime() - N.getTime();
-    }).forEach((R) => {
+    }).forEach((x) => {
       var E;
-      const A = f ? typeof f == "function" ? f(R.annotation, R.state) : f : (E = R.state) != null && E.selected ? j : _, C = p && p.paint(R, l) || A, N = R.rects.map(({ x: a, y: m, width: b, height: h }) => ({
+      const R = u ? typeof u == "function" ? u(x.annotation, x.state) : u : (E = x.state) != null && E.selected ? j : _, C = p && p.paint(x, l) || R, N = x.rects.map(({ x: a, y: m, width: b, height: h }) => ({
         x: a + L,
         y: m + d,
         width: b,
@@ -361,7 +351,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
         });
       }
     });
-  }), o = $(() => Qt(e), 10);
+  }), o = $(() => Gt(e), 10);
   return window.addEventListener("resize", o), {
     destroy: () => {
       e.remove(), o.clear(), window.removeEventListener("resize", o);
@@ -371,13 +361,13 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     },
     redraw: r
   };
-}, Jt = (t, e, n) => J(t, e, n, Zt(t)), te = (t) => [
-  `background-color:${ot((t == null ? void 0 : t.fill) || _.fill).alpha((t == null ? void 0 : t.fillOpacity) === void 0 ? _.fillOpacity : t.fillOpacity).toHex()}`,
+}, Zt = (t, e, n) => tt(t, e, n, Qt(t)), Jt = (t) => [
+  `background-color:${Z((t == null ? void 0 : t.fill) || _.fill).alpha((t == null ? void 0 : t.fillOpacity) === void 0 ? _.fillOpacity : t.fillOpacity).toHex()}`,
   t != null && t.underlineThickness ? "text-decoration:underline" : void 0,
   t != null && t.underlineColor ? `text-decoration-color:${t.underlineColor}` : void 0,
   t != null && t.underlineOffset ? `text-underline-offset:${t.underlineOffset}px` : void 0,
   t != null && t.underlineThickness ? `text-decoration-thickness:${t.underlineThickness}px` : void 0
-].filter(Boolean).join(";"), ee = () => {
+].filter(Boolean).join(";"), te = () => {
   const t = document.createElement("style");
   document.getElementsByTagName("head")[0].appendChild(t);
   let e = /* @__PURE__ */ new Set();
@@ -390,21 +380,21 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     },
     redraw: (s, i, c, l) => {
       l && l.clear();
-      const f = new Set(s.map((u) => u.annotation.id));
-      Array.from(e).filter((u) => !f.has(u));
-      const p = s.map((u) => {
+      const u = new Set(s.map((f) => f.annotation.id));
+      Array.from(e).filter((f) => !u.has(f));
+      const p = s.map((f) => {
         var L;
-        const g = c ? typeof c == "function" ? c(u.annotation, u.state) : c : (L = u.state) != null && L.selected ? j : _, d = l && l.paint(u, i) || g;
-        return `::highlight(_${u.annotation.id}) { ${te(d)} }`;
+        const g = c ? typeof c == "function" ? c(f.annotation, f.state) : c : (L = f.state) != null && L.selected ? j : _, d = l && l.paint(f, i) || g;
+        return `::highlight(_${f.annotation.id}) { ${Jt(d)} }`;
       });
       t.innerHTML = p.join(`
-`), CSS.highlights.clear(), s.forEach(({ annotation: u }) => {
-        const g = u.target.selector.map((L) => L.range), d = new Highlight(...g);
-        CSS.highlights.set(`_${u.id}`, d);
-      }), e = f;
+`), CSS.highlights.clear(), s.forEach(({ annotation: f }) => {
+        const g = f.target.selector.map((L) => L.range), d = new Highlight(...g);
+        CSS.highlights.set(`_${f.id}`, d);
+      }), e = u;
     }
   };
-}, ne = (t, e, n) => J(t, e, n, ee()), oe = (t, e) => {
+}, ee = (t, e, n) => tt(t, e, n, te()), ne = (t) => (t == null ? void 0 : t.fillOpacity) !== void 0 ? Z((t == null ? void 0 : t.fill) || _.fill).alpha(t.fillOpacity).toHex() : t != null && t.fill ? t.fill : Z(_.fill).alpha(_.fillOpacity).toHex(), oe = (t, e) => {
   const n = (s, i) => s.x <= i.x + i.width && s.x + s.width >= i.x && s.y <= i.y + i.height && s.y + s.height >= i.y, r = (s) => s.rects.reduce((i, c) => i + c.width, 0), o = e.filter(({ rects: s }) => s.some((i) => n(t, i)));
   return o.sort((s, i) => r(i) - r(s)), o.findIndex((s) => s.rects.includes(t));
 }, se = (t) => {
@@ -416,18 +406,18 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     destroy: () => {
       e.remove();
     },
-    redraw: (i, c, l, f, p) => {
+    redraw: (i, c, l, u, p) => {
       const g = !(gt(n, i) && p);
-      if (!f && !g) return;
+      if (!u && !g) return;
       g && (e.innerHTML = ""), [...i].sort((L, w) => {
-        const { annotation: { target: { created: R } } } = L, { annotation: { target: { created: A } } } = w;
-        return R && A ? R.getTime() - A.getTime() : 0;
+        const { annotation: { target: { created: x } } } = L, { annotation: { target: { created: R } } } = w;
+        return x && R ? x.getTime() - R.getTime() : 0;
       }).forEach((L) => {
         L.rects.map((w) => {
-          const R = oe(w, i), A = zt(L, c, l, f, R);
+          const x = oe(w, i), R = Xt(L, c, l, u, x);
           if (g) {
             const C = document.createElement("span");
-            C.className = "r6o-annotation", C.dataset.annotation = L.annotation.id, C.style.left = `${w.x}px`, C.style.top = `${w.y}px`, C.style.width = `${w.width}px`, C.style.height = `${w.height}px`, C.style.backgroundColor = ot((A == null ? void 0 : A.fill) || _.fill).alpha((A == null ? void 0 : A.fillOpacity) === void 0 ? _.fillOpacity : A.fillOpacity).toHex(), A.underlineStyle && (C.style.borderStyle = A.underlineStyle), A.underlineColor && (C.style.borderColor = A.underlineColor), A.underlineThickness && (C.style.borderBottomWidth = `${A.underlineThickness}px`), A.underlineOffset && (C.style.paddingBottom = `${A.underlineOffset}px`), e.appendChild(C);
+            C.className = "r6o-annotation", C.dataset.annotation = L.annotation.id, C.style.left = `${w.x}px`, C.style.top = `${w.y}px`, C.style.width = `${w.width}px`, C.style.height = `${w.height}px`, C.style.backgroundColor = ne(R), R.underlineStyle && (C.style.borderStyle = R.underlineStyle), R.underlineColor && (C.style.borderColor = R.underlineColor), R.underlineThickness && (C.style.borderBottomWidth = `${R.underlineThickness}px`), R.underlineOffset && (C.style.paddingBottom = `${R.underlineOffset}px`), e.appendChild(C);
           }
         });
       }), n = i;
@@ -436,7 +426,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
       i ? e.classList.remove("hidden") : e.classList.add("hidden");
     }
   };
-}, re = (t, e, n) => J(t, e, n, se(t)), ke = (t, e) => ({
+}, re = (t, e, n) => tt(t, e, n, se(t)), ke = (t, e) => ({
   parse: (n) => ce(n),
   serialize: (n) => le(n, t, e)
 }), ie = (t) => t.quote !== void 0 && t.start !== void 0 && t.end !== void 0, ae = (t) => {
@@ -459,16 +449,16 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     styleClass: "styleClass" in i[0] ? i[0].styleClass : void 0
   };
   for (const l of i) {
-    const p = (Array.isArray(l.selector) ? l.selector : [l.selector]).reduce((u, g) => {
+    const p = (Array.isArray(l.selector) ? l.selector : [l.selector]).reduce((f, g) => {
       switch (g.type) {
         case "TextQuoteSelector":
-          u.quote = g.exact;
+          f.quote = g.exact;
           break;
         case "TextPositionSelector":
-          u.start = g.start, u.end = g.end;
+          f.start = g.start, f.end = g.end;
           break;
       }
-      return u;
+      return f;
     }, {});
     if (c.outdated || (c.outdated = "outdated" in l ? l.outdated : void 0), ie(p))
       c.selector.push(
@@ -480,11 +470,11 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
         }
       );
     else {
-      const u = [
+      const f = [
         p.start ? void 0 : "TextPositionSelector",
         p.quote ? void 0 : "TextQuoteSelector"
       ].filter(Boolean);
-      return { error: Error(`Missing selector types: ${u.join(" and ")} for annotation: ${t.id}`) };
+      return { error: Error(`Missing selector types: ${f.join(" and ")} for annotation: ${t.id}`) };
     }
   }
   return { parsed: c };
@@ -509,21 +499,21 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     selector: i,
     creator: c,
     created: l,
-    updated: f,
+    updated: u,
     ...p
-  } = o, u = i.map((g) => {
-    const { id: d, quote: L, start: w, end: R, range: A } = g, C = {
+  } = o, f = i.map((g) => {
+    const { id: d, quote: L, start: w, end: x, range: R } = g, C = {
       type: "TextQuoteSelector",
       exact: L
     };
     if (n) {
-      const { prefix: E, suffix: a } = Pt(A, n);
+      const { prefix: E, suffix: a } = Dt(R, n);
       C.prefix = E, C.suffix = a;
     }
     const N = {
       type: "TextPositionSelector",
       start: w,
-      end: R
+      end: x
     };
     return {
       ...p,
@@ -542,21 +532,21 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     body: mt(t.bodies),
     creator: c,
     created: l == null ? void 0 : l.toISOString(),
-    modified: f == null ? void 0 : f.toISOString(),
-    target: u
+    modified: u == null ? void 0 : u.toISOString(),
+    target: f
   };
 }, de = (t, e, n, r) => {
-  const o = new xt(), s = /* @__PURE__ */ new Map(), i = Rt(), c = (a, m) => {
+  const o = new xt(), s = /* @__PURE__ */ new Map(), i = Tt(), c = (a, m) => {
     const b = a.selector.flatMap((S) => {
-      const x = P([S]) ? S.range : it(S, e).range;
-      return It(x);
-    }), h = Kt(b, n, r).map((S) => Yt(S, m));
+      const A = P([S]) ? S.range : at(S, e).range;
+      return Ht(A);
+    }), h = Kt(b, n, r).map((S) => Vt(S, m));
     return h.map((S) => {
-      const { x, y: T, width: k, height: y } = S;
+      const { x: A, y: T, width: B, height: y } = S;
       return {
-        minX: x,
+        minX: A,
         minY: T,
-        maxX: x + k,
+        maxX: A + B,
         maxY: T + y,
         annotation: {
           id: a.annotation,
@@ -564,23 +554,23 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
         }
       };
     });
-  }, l = () => [...s.values()], f = () => {
+  }, l = () => [...s.values()], u = () => {
     o.clear(), s.clear();
   }, p = (a) => {
     const m = c(a, e.getBoundingClientRect());
     m.length !== 0 && (m.forEach((b) => o.insert(b)), s.set(a.annotation, m));
-  }, u = (a) => {
+  }, f = (a) => {
     const m = s.get(a.annotation);
     m && (m.forEach((b) => o.remove(b)), s.delete(a.annotation));
   }, g = (a) => {
-    u(a), p(a);
+    f(a), p(a);
   }, d = (a, m = !0) => {
-    m && f();
-    const b = e.getBoundingClientRect(), h = a.map((x) => ({ target: x, rects: c(x, b) }));
-    h.forEach(({ target: x, rects: T }) => {
-      T.length > 0 && s.set(x.annotation, T);
+    m && u();
+    const b = e.getBoundingClientRect(), h = a.map((A) => ({ target: A, rects: c(A, b) }));
+    h.forEach(({ target: A, rects: T }) => {
+      T.length > 0 && s.set(A.annotation, T);
     });
-    const S = h.flatMap(({ rects: x }) => x);
+    const S = h.flatMap(({ rects: A }) => A);
     o.load(S);
   }, L = (a, m, b = !1) => {
     const h = o.search({
@@ -588,71 +578,71 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
       minY: m,
       maxX: a,
       maxY: m
-    }), S = (x) => x.annotation.rects.reduce((T, k) => T + k.width * k.height, 0);
-    return h.length > 0 ? (h.sort((x, T) => S(x) - S(T)), b ? h.map((x) => x.annotation.id) : [h[0].annotation.id]) : [];
+    }), S = (A) => A.annotation.rects.reduce((T, B) => T + B.width * B.height, 0);
+    return h.length > 0 ? (h.sort((A, T) => S(A) - S(T)), b ? h.map((A) => A.annotation.id) : [h[0].annotation.id]) : [];
   }, w = (a) => {
-    const m = R(a);
+    const m = x(a);
     if (m.length === 0)
       return;
-    let b = m[0].left, h = m[0].top, S = m[0].right, x = m[0].bottom;
+    let b = m[0].left, h = m[0].top, S = m[0].right, A = m[0].bottom;
     for (let T = 1; T < m.length; T++) {
-      const k = m[T];
-      b = Math.min(b, k.left), h = Math.min(h, k.top), S = Math.max(S, k.right), x = Math.max(x, k.bottom);
+      const B = m[T];
+      b = Math.min(b, B.left), h = Math.min(h, B.top), S = Math.max(S, B.right), A = Math.max(A, B.bottom);
     }
-    return new DOMRect(b, h, S - b, x - h);
-  }, R = (a) => {
+    return new DOMRect(b, h, S - b, A - h);
+  }, x = (a) => {
     const m = s.get(a);
     return m ? m[0].annotation.rects : [];
   };
   return {
     all: l,
-    clear: f,
+    clear: u,
     getAt: L,
     getAnnotationBounds: w,
-    getAnnotationRects: R,
+    getAnnotationRects: x,
     getIntersecting: (a, m, b, h) => {
-      const S = o.search({ minX: a, minY: m, maxX: b, maxY: h }), x = new Set(S.map((T) => T.annotation.id));
-      return Array.from(x).map((T) => ({
+      const S = o.search({ minX: a, minY: m, maxX: b, maxY: h }), A = new Set(S.map((T) => T.annotation.id));
+      return Array.from(A).map((T) => ({
         annotation: t.getAnnotation(T),
-        rects: R(T)
+        rects: x(T)
       })).filter((T) => !!T.annotation);
     },
     insert: p,
     recalculate: () => {
       d(t.all().map((a) => a.target), !0), i.emit("recalculate");
     },
-    remove: u,
+    remove: f,
     set: d,
     size: () => o.all().length,
     update: g,
     on: (a, m) => i.on(a, m)
   };
-}, ue = (t, e) => {
+}, fe = (t, e) => {
   var C, N;
-  const n = yt(), r = de(n, t, (C = e.mergeHighlights) == null ? void 0 : C.horizontalTolerance, (N = e.mergeHighlights) == null ? void 0 : N.verticalTolerance), o = bt(n, e.userSelectAction, e.adapter), s = St(n), i = Ct(), c = (E, a = F.LOCAL) => {
+  const n = bt(), r = de(n, t, (C = e.mergeHighlights) == null ? void 0 : C.horizontalTolerance, (N = e.mergeHighlights) == null ? void 0 : N.verticalTolerance), o = yt(n, e.userSelectAction, e.adapter), s = St(n), i = Ct(), c = (E, a = K.LOCAL) => {
     const m = G(E, t), b = P(m.target.selector);
     return b && n.addAnnotation(m, a), b;
-  }, l = (E, a = !0, m = F.LOCAL) => {
+  }, l = (E, a = !0, m = K.LOCAL) => {
     const b = E.map((S) => G(S, t)), h = b.filter((S) => !P(S.target.selector));
     return n.bulkAddAnnotations(b, a, m), h;
-  }, f = (E, a = F.LOCAL) => {
+  }, u = (E, a = K.LOCAL) => {
     const m = E.map((h) => G(h, t)), b = m.filter((h) => !P(h.target.selector));
     return m.forEach((h) => {
       n.getAnnotation(h.id) ? n.updateAnnotation(h, a) : n.addAnnotation(h, a);
     }), b;
-  }, p = (E, a = F.LOCAL) => {
+  }, p = (E, a = K.LOCAL) => {
     const m = q(E, t);
     n.updateTarget(m, a);
-  }, u = (E, a = F.LOCAL) => {
+  }, f = (E, a = K.LOCAL) => {
     const m = E.map((b) => q(b, t));
     n.bulkUpdateTargets(m, a);
   };
   function g(E, a, m, b) {
-    const h = m || !!b, S = r.getAt(E, a, h).map((T) => n.getAnnotation(T)), x = b ? S.filter(b) : S;
-    if (x.length !== 0)
-      return m ? x : x[0];
+    const h = m || !!b, S = r.getAt(E, a, h).map((T) => n.getAnnotation(T)), A = b ? S.filter(b) : S;
+    if (A.length !== 0)
+      return m ? A : A[0];
   }
-  const d = (E) => r.getAnnotationRects(E).length > 0 ? r.getAnnotationBounds(E) : void 0, L = (E, a, m, b) => r.getIntersecting(E, a, m, b), w = (E) => r.getAnnotationRects(E), R = () => r.recalculate(), A = (E) => r.on("recalculate", E);
+  const d = (E) => r.getAnnotationRects(E).length > 0 ? r.getAnnotationBounds(E) : void 0, L = (E, a, m, b) => r.getIntersecting(E, a, m, b), w = (E) => r.getAnnotationRects(E), x = () => r.recalculate(), R = (E) => r.on("recalculate", E);
   return n.observe(({ changes: E }) => {
     const a = (E.deleted || []).filter((h) => P(h.target.selector)), m = (E.created || []).filter((h) => P(h.target.selector)), b = (E.updated || []).filter((h) => P(h.newValue.target.selector));
     (a == null ? void 0 : a.length) > 0 && a.forEach((h) => r.remove(h.target)), m.length > 0 && r.set(m.map((h) => h.target), !1), (b == null ? void 0 : b.length) > 0 && b.forEach(({ newValue: h }) => r.update(h.target));
@@ -661,47 +651,47 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
       ...n,
       addAnnotation: c,
       bulkAddAnnotations: l,
-      bulkUpdateTargets: u,
-      bulkUpsertAnnotations: f,
+      bulkUpdateTargets: f,
+      bulkUpsertAnnotations: u,
       getAnnotationBounds: d,
       getAnnotationRects: w,
       getIntersecting: L,
       getAt: g,
-      recalculatePositions: R,
-      onRecalculatePositions: A,
+      recalculatePositions: x,
+      onRecalculatePositions: R,
       updateTarget: p
     },
     selection: o,
     hover: s,
     viewport: i
   };
-}, fe = () => {
+}, ue = () => {
   const t = document.createElement("canvas");
   t.width = 2 * window.innerWidth, t.height = 2 * window.innerHeight, t.className = "r6o-presence-layer";
   const e = t.getContext("2d");
   return e.scale(2, 2), e.translate(0.5, 0.5), t;
 }, ge = (t, e = {}) => {
-  const n = fe(), r = n.getContext("2d");
+  const n = ue(), r = n.getContext("2d");
   document.body.appendChild(n);
-  const o = /* @__PURE__ */ new Map(), s = (p) => Array.from(o.entries()).filter(([u, g]) => g.presenceKey === p.presenceKey).map(([u, g]) => u);
-  return t.on("selectionChange", (p, u) => {
-    s(p).forEach((d) => o.delete(d)), u && u.forEach((d) => o.set(d, p));
+  const o = /* @__PURE__ */ new Map(), s = (p) => Array.from(o.entries()).filter(([f, g]) => g.presenceKey === p.presenceKey).map(([f, g]) => f);
+  return t.on("selectionChange", (p, f) => {
+    s(p).forEach((d) => o.delete(d)), f && f.forEach((d) => o.set(d, p));
   }), {
     clear: () => {
-      const { width: p, height: u } = n;
-      r.clearRect(-0.5, -0.5, p + 1, u + 1);
+      const { width: p, height: f } = n;
+      r.clearRect(-0.5, -0.5, p + 1, f + 1);
     },
     destroy: () => {
       n.remove();
     },
-    paint: (p, u, g) => {
+    paint: (p, f, g) => {
       e.font && (r.font = e.font);
       const d = o.get(p.annotation.id);
       if (d) {
-        const { height: L } = p.rects[0], w = p.rects[0].x + u.left, R = p.rects[0].y + u.top;
-        r.fillStyle = d.appearance.color, r.fillRect(w - 2, R - 2.5, 2, L + 5);
-        const A = r.measureText(d.appearance.label), C = A.width + 6, N = A.actualBoundingBoxAscent + A.actualBoundingBoxDescent + 8, E = A.fontBoundingBoxAscent ? 8 : 6.5;
-        return r.fillRect(w - 2, R - 2.5 - N, C, N), r.fillStyle = "#fff", r.fillText(d.appearance.label, w + 1, R - E), {
+        const { height: L } = p.rects[0], w = p.rects[0].x + f.left, x = p.rects[0].y + f.top;
+        r.fillStyle = d.appearance.color, r.fillRect(w - 2, x - 2.5, 2, L + 5);
+        const R = r.measureText(d.appearance.label), C = R.width + 6, N = R.actualBoundingBoxAscent + R.actualBoundingBoxDescent + 8, E = R.fontBoundingBoxAscent ? 8 : 6.5;
+        return r.fillRect(w - 2, x - 2.5 - N, C, N), r.fillStyle = "#fff", r.fillText(d.appearance.label, w + 1, x - E), {
           fill: d.appearance.color,
           fillOpacity: g ? 0.45 : 0.18
         };
@@ -713,7 +703,7 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
       p.scale(2, 2), p.translate(0.5, 0.5);
     }
   };
-}, et = 300, lt = ["up", "down", "left", "right"], dt = kt ? "⌘+a" : "ctrl+a", me = [
+}, nt = 300, lt = ["up", "down", "left", "right"], dt = kt ? "⌘+a" : "ctrl+a", me = [
   ...lt.map((t) => `shift+${t}`),
   dt
 ], pe = (t, e, n) => {
@@ -723,71 +713,71 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
     annotatingEnabled: i,
     offsetReferenceSelector: c,
     selectionMode: l,
-    dismissOnNotAnnotatable: f = "NEVER"
+    dismissOnNotAnnotatable: u = "NEVER"
   } = n, p = (y) => s = y;
-  let u;
-  const g = (y) => u = y;
-  let d, L, w, R = i;
-  const A = (y) => {
-    R = y, N.clear(), y || (d = void 0, L = void 0, w = void 0);
-  }, C = (y) => {
-    R && L !== !1 && (d = K(t, y.target) ? void 0 : {
+  let f;
+  const g = (y) => f = y;
+  let d, L, w, x = i;
+  const R = (y) => {
+    x = y, N.clear(), y || (d = void 0, L = void 0, w = void 0);
+  }, C = () => {
+    x && L !== !1 && (d = {
       annotation: st(),
       selector: [],
       creator: s,
       created: /* @__PURE__ */ new Date()
     });
   }, N = $((y) => {
-    if (!R) return;
+    if (!x) return;
     const v = document.getSelection();
     if (!(v != null && v.anchorNode))
       return;
-    if (K(t, v.anchorNode)) {
+    const I = Array.from(Array(v.rangeCount).keys()).map((k) => v.getRangeAt(k));
+    if (!I.some((k) => k.intersectsNode(t))) {
       d = void 0;
       return;
     }
-    const I = y.timeStamp - ((w == null ? void 0 : w.timeStamp) || y.timeStamp);
-    if ((w == null ? void 0 : w.type) === "pointerdown" && (I < 1e3 && !d || v.isCollapsed && I < et) && C(w || y), !d) return;
-    if (v.isCollapsed) {
+    const D = y.timeStamp - ((w == null ? void 0 : w.timeStamp) || y.timeStamp);
+    if ((w == null ? void 0 : w.type) === "pointerdown" && (D < 1e3 && !d || v.isCollapsed && D < nt) && C(), d || C(), v.isCollapsed) {
       r.getAnnotation(d.annotation) && (o.clear(), r.deleteAnnotation(d.annotation));
       return;
     }
-    const M = Array.from(Array(v.rangeCount).keys()).map((B) => v.getRangeAt(B)).map((B) => Vt(B, t));
-    if (M.every((B) => Dt(B))) return;
-    const O = M.flatMap((B) => Ht(t, B.cloneRange()));
-    (O.length !== d.selector.length || O.some((B, D) => {
-      var U;
-      return B.toString() !== ((U = d.selector[D]) == null ? void 0 : U.quote);
+    const M = I.map((k) => Wt(k, t));
+    if (M.every((k) => It(k))) return;
+    const O = M.flatMap((k) => _t(t, k.cloneRange()));
+    (O.length > 0 && !d || O.length !== d.selector.length || O.some((k, U) => {
+      var F;
+      return k.toString() !== ((F = d.selector[U]) == null ? void 0 : F.quote);
     })) && (d = {
       ...d,
-      selector: O.map((B) => $t(B, t, c)),
+      selector: O.map((k) => $t(k, t, c)),
       updated: /* @__PURE__ */ new Date()
-    }, r.getAnnotation(d.annotation) ? r.updateTarget(d, F.LOCAL) : o.clear());
+    }, r.getAnnotation(d.annotation) ? r.updateTarget(d, K.LOCAL) : o.clear());
   }, 10), E = (y) => {
     w = Q(y), L = w.button === 0;
   }, a = async (y) => {
     if (!L) return;
     const v = Q(y), I = () => {
       const { x: M, y: O } = t.getBoundingClientRect();
-      if (K(t, v.target)) {
-        (typeof f == "function" ? f(v, t) : f === "ALWAYS") && o.clear();
+      if (z(t, v.target)) {
+        (typeof u == "function" ? u(v, t) : u === "ALWAYS") && o.clear();
         return;
       }
       const H = v.target instanceof Node && t.contains(v.target) && r.getAt(
         v.clientX - M,
         v.clientY - O,
         l === "all",
-        u
+        f
       );
       if (H) {
-        const { selected: B } = o, D = new Set(B.map((Y) => Y.id)), U = Array.isArray(H) ? H.map((Y) => Y.id) : [H.id];
-        (D.size !== U.length || !U.every((Y) => D.has(Y))) && o.userSelect(U, v);
+        const { selected: k } = o, U = new Set(k.map((V) => V.id)), F = Array.isArray(H) ? H.map((V) => V.id) : [H.id];
+        (U.size !== F.length || !F.every((V) => U.has(V))) && o.userSelect(F, v);
       } else
         o.clear();
     };
-    if (v.timeStamp - w.timeStamp < et) {
+    if (v.timeStamp - w.timeStamp < nt) {
       await m();
-      const M = document.getSelection(), O = K(t, w.target), H = K(t, v.target);
+      const M = document.getSelection(), O = z(t, w.target), H = z(t, v.target);
       if (M != null && M.isCollapsed || O && H) {
         d = void 0, I();
         return;
@@ -797,32 +787,32 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   }, m = async () => {
     const y = document.getSelection();
     let v = !1, I = y == null ? void 0 : y.isCollapsed;
-    const V = () => I || v, M = 1;
-    return setTimeout(() => v = !0, 50), Tt(() => I = y == null ? void 0 : y.isCollapsed, M, V);
+    const D = () => I || v, M = 1;
+    return setTimeout(() => v = !0, 50), Rt(() => I = y == null ? void 0 : y.isCollapsed, M, D);
   }, b = (y) => {
     const v = document.getSelection();
     v != null && v.isCollapsed || ((!d || d.selector.length === 0) && N(y), d && (T(), o.userSelect(d.annotation, Q(y))));
   }, h = (y) => {
-    R && y.key === "Shift" && d && (document.getSelection().isCollapsed || (T(), o.userSelect(d.annotation, z(y))));
+    x && y.key === "Shift" && d && (document.getSelection().isCollapsed || (T(), o.userSelect(d.annotation, X(y))));
   }, S = (y) => {
     const v = () => setTimeout(() => {
       (d == null ? void 0 : d.selector.length) > 0 && (o.clear(), r.addAnnotation({
         id: d.annotation,
         bodies: [],
         target: d
-      }), o.userSelect(d.annotation, z(y))), document.removeEventListener("selectionchange", v);
+      }), o.userSelect(d.annotation, X(y))), document.removeEventListener("selectionchange", v);
     }, 100);
-    document.addEventListener("selectionchange", v), C(y);
+    document.addEventListener("selectionchange", v), C();
   };
-  X(me.join(","), { element: t, keydown: !0, keyup: !1 }, (y) => {
-    y.repeat || (w = z(y));
-  }), X(dt, { keydown: !0, keyup: !1 }, (y) => {
-    w = z(y), S(y);
+  Y(me.join(","), { element: t, keydown: !0, keyup: !1 }, (y) => {
+    y.repeat || (w = X(y));
+  }), Y(dt, { keydown: !0, keyup: !1 }, (y) => {
+    w = X(y), S(y);
   });
-  const x = (y) => {
+  const A = (y) => {
     y.repeat || y.target !== t && y.target !== document.body || (d = void 0, o.clear());
   };
-  X(lt.join(","), { keydown: !0, keyup: !1 }, x);
+  Y(lt.join(","), { keydown: !0, keyup: !1 }, A);
   const T = () => {
     const y = r.getAnnotation(d.annotation);
     if (!y) {
@@ -838,60 +828,60 @@ const rt = "not-annotatable", W = `.${rt}`, K = (t, e) => {
   };
   return document.addEventListener("pointerdown", E), document.addEventListener("pointerup", a), document.addEventListener("contextmenu", b), t.addEventListener("keyup", h), t.addEventListener("selectstart", C), document.addEventListener("selectionchange", N), {
     destroy: () => {
-      d = void 0, L = void 0, w = void 0, N.clear(), document.removeEventListener("pointerdown", E), document.removeEventListener("pointerup", a), document.removeEventListener("contextmenu", b), t.removeEventListener("keyup", h), t.removeEventListener("selectstart", C), document.removeEventListener("selectionchange", N), X.unbind();
+      d = void 0, L = void 0, w = void 0, N.clear(), document.removeEventListener("pointerdown", E), document.removeEventListener("pointerup", a), document.removeEventListener("contextmenu", b), t.removeEventListener("keyup", h), t.removeEventListener("selectstart", C), document.removeEventListener("selectionchange", N), Y.unbind();
     },
     setFilter: g,
     setUser: p,
-    setAnnotatingEnabled: A
+    setAnnotatingEnabled: R
   };
 }, he = (t, e) => ({
   ...t,
   annotatingEnabled: t.annotatingEnabled ?? e.annotatingEnabled,
   user: t.user || e.user
-}), nt = "SPANS", Be = (t, e = {}) => {
+}), ot = "SPANS", Be = (t, e = {}) => {
   Nt(t), Bt(t);
   const n = he(e, {
     annotatingEnabled: !0,
     user: Et()
-  }), r = ue(t, n), { selection: o, viewport: s } = r, i = r.store, c = wt(i), l = At(r, c, n.adapter);
-  let f = n.user;
-  const p = n.renderer === "CSS_HIGHLIGHTS" ? CSS.highlights ? "CSS_HIGHLIGHTS" : nt : n.renderer || nt, u = p === "SPANS" ? re(t, r, s) : p === "CSS_HIGHLIGHTS" ? ne(t, r, s) : p === "CANVAS" ? Jt(t, r, s) : void 0;
-  if (!u)
+  }), r = fe(t, n), { selection: o, viewport: s } = r, i = r.store, c = wt(i), l = At(r, c, n.adapter);
+  let u = n.user;
+  const p = n.renderer === "CSS_HIGHLIGHTS" ? CSS.highlights ? "CSS_HIGHLIGHTS" : ot : n.renderer || ot, f = p === "SPANS" ? re(t, r, s) : p === "CSS_HIGHLIGHTS" ? ee(t, r, s) : p === "CANVAS" ? Zt(t, r, s) : void 0;
+  if (!f)
     throw `Unknown renderer implementation: ${p}`;
-  console.debug(`Using ${p} renderer`), n.style && u.setStyle(n.style);
+  console.debug(`Using ${p} renderer`), n.style && f.setStyle(n.style);
   const g = pe(t, r, n);
-  g.setUser(f), g.setAnnotatingEnabled(n.annotatingEnabled);
-  const d = vt(r, c, n.adapter), L = () => f, w = (a) => {
+  g.setUser(u), g.setAnnotatingEnabled(n.annotatingEnabled);
+  const d = vt(r, c, n.adapter), L = () => u, w = (a) => {
     g.setAnnotatingEnabled(
       a === void 0 ? !0 : a
     );
+  }, x = (a) => {
+    f.setFilter(a), g.setFilter(a);
   }, R = (a) => {
-    u.setFilter(a), g.setFilter(a);
-  }, A = (a) => {
-    f = a, g.setUser(a);
+    u = a, g.setUser(a);
   }, C = (a) => {
-    a && (u.setPainter(ge(a, n.presence)), a.on("selectionChange", () => u.redraw()));
+    a && (f.setPainter(ge(a, n.presence)), a.on("selectionChange", () => f.redraw()));
   }, N = (a) => {
     a ? o.setSelected(a) : o.clear();
   };
   return {
     ...d,
     destroy: () => {
-      u.destroy(), g.destroy(), c.destroy();
+      f.destroy(), g.destroy(), c.destroy();
     },
     element: t,
     getUser: L,
     setAnnotatingEnabled: w,
-    setFilter: R,
-    setStyle: u.setStyle.bind(u),
-    redraw: u.redraw.bind(u),
-    setUser: A,
+    setFilter: x,
+    setStyle: f.setStyle.bind(f),
+    redraw: f.redraw.bind(f),
+    setUser: R,
     setSelected: N,
     setPresenceProvider: C,
-    setVisible: u.setVisible.bind(u),
+    setVisible: f.setVisible.bind(f),
     on: l.on,
     off: l.off,
-    scrollIntoView: Xt(t, i),
+    scrollIntoView: Yt(t, i),
     state: r
   };
 };
@@ -904,41 +894,42 @@ export {
   Pe as UserSelectAction,
   ke as W3CTextFormat,
   Nt as cancelSingleClickEvents,
-  z as cloneKeyboardEvent,
+  X as cloneKeyboardEvent,
   Q as clonePointerEvent,
   _e as createBody,
-  Jt as createCanvasRenderer,
-  ne as createHighlightsRenderer,
+  Zt as createCanvasRenderer,
+  ee as createHighlightsRenderer,
   ge as createPresencePainter,
-  ee as createRenderer,
+  te as createRenderer,
   pe as createSelectionHandler,
   re as createSpansRenderer,
   Be as createTextAnnotator,
-  ue as createTextAnnotatorState,
+  fe as createTextAnnotatorState,
   he as fillDefaults,
-  It as getHighlightClientRects,
-  Pt as getQuoteContext,
-  Z as getRangeAnnotatableContents,
+  Ht as getHighlightClientRects,
+  Dt as getQuoteContext,
+  J as getRangeAnnotatableContents,
   kt as isMac,
-  K as isNotAnnotatable,
+  Mt as isNodeWhitespaceOrEmpty,
+  z as isNotAnnotatable,
   Lt as isRangeAnnotatable,
+  It as isRangeWhitespaceOrEmpty,
   P as isRevived,
-  Dt as isWhitespaceOrEmpty,
   Kt as mergeClientRects,
-  zt as paint,
+  Xt as paint,
   ce as parseW3CTextAnnotation,
   Bt as programmaticallyFocusable,
   $t as rangeToSelector,
   G as reviveAnnotation,
-  it as reviveSelector,
+  at as reviveSelector,
   q as reviveTarget,
-  Xt as scrollIntoView,
+  Yt as scrollIntoView,
   le as serializeW3CTextAnnotation,
-  Ht as splitAnnotatableRanges,
+  _t as splitAnnotatableRanges,
   Ne as toDomRectList,
-  Yt as toParentBounds,
+  Vt as toParentBounds,
   Oe as toViewportBounds,
-  Vt as trimRangeToContainer,
-  _t as whitespaceOrEmptyRegex
+  Wt as trimRangeToContainer,
+  it as whitespaceOrEmptyRegex
 };
 //# sourceMappingURL=text-annotator.es.js.map