@soomo/text-annotator 3.4.1-staging.0 → 3.4.2-staging.0

package/dist/text-annotator.es.js

@@ -21,21 +21,34 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   !e.target.closest(W) && !e.target.closest("a") && e.preventDefault();
 }), 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 = /^\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);
+}, It = (t) => {
+  const e = [], n = document.createNodeIterator(
+    t.commonAncestorContainer,
+    NodeFilter.SHOW_TEXT
+  );
   let r;
   for (; r = n.nextNode(); )
-    t.intersectsNode(r) && !Mt(r) && e.push(r);
+    t.intersectsNode(r) && e.push(r);
   if (e.length < 2)
     return Array.from(t.getClientRects());
   {
     const o = e[0], s = e[e.length - 1], i = document.createRange();
-    i.selectNode(o), t.startContainer.nodeType === Node.TEXT_NODE ? i.setStart(o, t.startOffset) : i.setStartAfter(t.startContainer);
+    if (i.selectNode(o), t.startContainer.nodeType === Node.TEXT_NODE)
+      i.setStart(o, t.startOffset);
+    else {
+      const f = t.startContainer.childNodes[t.startOffset];
+      f ? i.setStartBefore(f) : 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 = (u) => {
+    if (c.selectNode(s), t.endContainer.nodeType === Node.TEXT_NODE)
+      c.setEnd(s, t.endOffset);
+    else {
+      const f = t.endContainer.childNodes[t.endOffset];
+      f ? c.setEndBefore(f) : c.setEndAfter(t.endContainer);
+    }
+    const l = (f) => {
       const p = document.createRange();
-      return p.selectNode(u), Array.from(p.getClientRects());
+      return p.selectNode(f), Array.from(p.getClientRects());
     };
     return [
       ...Array.from(i.getClientRects()),
@@ -43,7 +56,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       ...Array.from(c.getClientRects())
     ];
   }
-}, Pt = function* (t) {
+}, Mt = function* (t) {
   const e = document.createNodeIterator(
     t.commonAncestorContainer,
     NodeFilter.SHOW_ELEMENT,
@@ -52,11 +65,11 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   let n;
   for (; n = e.nextNode(); )
     n instanceof HTMLElement && (yield n);
-}, _t = (t, e) => {
+}, Ht = (t, e) => {
   if (!Lt(t, e)) return [];
   const n = [];
   let r = null;
-  for (const o of Pt(e)) {
+  for (const o of Mt(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;
   }
@@ -68,7 +81,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
 }, J = (t) => {
   const e = t.cloneContents();
   return e.querySelectorAll(W).forEach((n) => n.remove()), e;
-}, Dt = (t, e, n = 10, r) => {
+}, Pt = (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 = J(s).textContent, c = document.createRange();
@@ -78,7 +91,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     prefix: i.substring(i.length - n),
     suffix: l.substring(0, n)
   };
-}, P = (t) => t.every((e) => e.range instanceof Range && !e.range.collapsed), Ut = (t, e, n, r) => {
+}, P = (t) => t.every((e) => e.range instanceof Range && !e.range.collapsed), it = /^\s*$/, _t = (t) => it.test(t.toString()), Le = (t) => it.test(t.textContent || ""), Dt = (t, e, n, r) => {
   const o = (c) => Math.round(c * 10) / 10, s = {
     top: o(t.top),
     bottom: o(t.bottom),
@@ -102,26 +115,26 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       return "block-contains";
   } else if (s.top >= i.top && s.bottom <= i.bottom && s.left >= i.left && s.right <= i.right)
     return "block-is-contained";
-}, Ft = (t, e) => {
+}, Ut = (t, e) => {
   const n = Math.min(t.left, e.left), r = Math.max(t.right, e.right), o = Math.min(t.top, e.top), s = Math.max(t.bottom, e.bottom);
   return new DOMRect(n, o, r - n, s - o);
-}, Kt = (t, e = 0.5, n = 0.5) => t.reduce((r, o) => {
+}, Ft = (t, e = 0.5, n = 0.5) => t.reduce((r, o) => {
   if (o.width === 0 || o.height === 0)
     return r;
   let s = [...r], i = !1;
   for (const c of r) {
-    const l = Ut(o, c, e, n);
+    const l = Dt(o, c, e, n);
     if (l === "inline-adjacent") {
-      s = s.map((u) => u === c ? Ft(o, c) : u), i = !0;
+      s = s.map((f) => f === c ? Ut(o, c) : f), i = !0;
       break;
     } else if (l === "inline-contains") {
-      s = s.map((u) => u === c ? o : u), i = !0;
+      s = s.map((f) => f === c ? o : f), 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((u) => u === c ? o : u)), o.width === c.width && o.height < c.width && (s = s.map((u) => u === c ? o : u)), i = !0;
+      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;
       break;
     }
   }
@@ -133,13 +146,13 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     for (let e = 0; e < this.length; e++)
       yield this.item(e);
   }
-}), $t = (t, e, n) => {
+}), Kt = (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 = 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 };
 }, at = (t, e) => {
-  var p, f;
+  var p, u;
   const { start: n, end: r } = t, o = t.offsetReference || e, s = document.createNodeIterator(
     e,
     NodeFilter.SHOW_TEXT,
@@ -152,9 +165,9 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   const c = document.createRange();
   let l = s.nextNode();
   l === null && console.error("Could not revive annotation target. Content missing.");
-  let u = !o;
+  let f = !o;
   for (; l !== null; ) {
-    if (u || (u = typeof (o == null ? void 0 : o.contains) == "function" ? o.contains(l) : !1), u) {
+    if (f || (f = typeof (o == null ? void 0 : o.contains) == "function" ? o.contains(l) : !1), f) {
       const g = ((p = l.textContent) == null ? void 0 : p.length) || 0;
       if (i + g > n) {
         c.setStart(l, n - i);
@@ -165,7 +178,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     l = s.nextNode();
   }
   for (; l !== null; ) {
-    const g = ((f = l.textContent) == null ? void 0 : f.length) || 0;
+    const g = ((u = l.textContent) == null ? void 0 : u.length) || 0;
     if (i + g >= r) {
       c.setEnd(l, r - i);
       break;
@@ -179,7 +192,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
 }, q = (t, e) => P(t.selector) ? t : {
   ...t,
   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) => {
+}, G = (t, e) => P(t.target.selector) ? t : { ...t, target: q(t.target, e) }, $t = (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) => ({
@@ -224,7 +237,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   defaultPrevented: t.defaultPrevented,
   detail: t.detail,
   timeStamp: t.timeStamp
-}), Vt = (t, e) => {
+}), Wt = (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) => {
@@ -236,9 +249,9 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   const { overflowY: e } = window.getComputedStyle(t);
   return e !== "visible" && e !== "hidden" && t.scrollHeight > t.clientHeight ? t : ct(t.parentElement);
 }, 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;
+  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;
   n.scroll({ top: d, left: L, behavior: "smooth" });
-}, Yt = (t, e) => (n, r) => {
+}, Vt = (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;
@@ -248,22 +261,22 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   const { range: c } = i.target.selector[0];
   if (c && !c.collapsed)
     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;
+  const l = q(i.target, t), { range: f } = l.selector[0];
+  return f && !f.collapsed ? (et(e, l, s), !0) : !1;
 }, _ = {
   fill: "rgb(0, 128, 255)",
   fillOpacity: 0.18
 }, j = {
   fill: "rgb(0, 128, 255)",
   fillOpacity: 0.45
-}, Xt = (t, e, n, r, o) => {
+}, Yt = (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;
-}, zt = (t) => {
+}, Xt = (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 };
-}, qt = (t) => {
+}, zt = (t) => {
   let e = /* @__PURE__ */ new Set();
   return (r) => {
     const o = r.map((s) => s.id);
@@ -271,15 +284,15 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   };
 }, tt = (t, e, n, r) => {
   const { store: o, selection: s, hover: i } = e;
-  let c, l, u;
-  const p = qt(n), f = $((S) => {
+  let c, l, f;
+  const p = zt(n), u = $((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", f);
+  t.addEventListener("pointermove", u);
   const g = $((S = !1) => requestAnimationFrame(() => {
-    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 }) => {
+    f && f.clear();
+    const A = Xt(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,
@@ -287,9 +300,9 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
         state: { selected: k, hovered: U }
       };
     });
-    r.redraw(M, A, c, u, S), setTimeout(() => p(I.map(({ annotation: O }) => O)), 1);
+    r.redraw(M, A, c, f, S), setTimeout(() => p(I.map(({ annotation: O }) => O)), 1);
   }), 10), d = (S) => {
-    u = S, g();
+    f = S, g();
   }, L = (S) => {
     c = S, g();
   }, w = (S) => {
@@ -299,7 +312,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   const R = s.subscribe(() => g()), C = i.subscribe(() => g()), N = () => g(!0);
   document.addEventListener("scroll", N, { capture: !0, passive: !0 });
   const E = $(() => {
-    o.recalculatePositions(), u == null || u.reset(), g();
+    o.recalculatePositions(), f == null || f.reset(), g();
   }, 10);
   window.addEventListener("resize", E);
   const a = new ResizeObserver(E);
@@ -309,7 +322,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   }, 150));
   return b.observe(document.body, m), {
     destroy: () => {
-      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();
+      t.removeEventListener("pointermove", u), 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,
@@ -317,25 +330,25 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     setPainter: d,
     setVisible: r.setVisible
   };
-}, jt = () => {
+}, qt = () => {
   const t = document.createElement("canvas");
   return t.width = window.innerWidth, t.height = window.innerHeight, t.className = "r6o-canvas-highlight-layer bg", t;
-}, Gt = (t, e) => {
+}, jt = (t, e) => {
   t.width = window.innerWidth, t.height = window.innerHeight;
-}, Qt = (t) => {
+}, Gt = (t) => {
   t.classList.add("r6o-annotatable");
-  const e = jt(), n = e.getContext("2d");
+  const e = qt(), n = e.getContext("2d");
   document.body.appendChild(e);
-  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 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 { top: d, left: L } = l;
     [...c].sort((x, R) => {
       const { annotation: { target: { created: C } } } = x, { annotation: { target: { created: N } } } = R;
       return C.getTime() - N.getTime();
     }).forEach((x) => {
       var E;
-      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 }) => ({
+      const R = f ? typeof f == "function" ? f(x.annotation, x.state) : f : (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,
@@ -351,7 +364,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
         });
       }
     });
-  }), o = $(() => Gt(e), 10);
+  }), o = $(() => jt(e), 10);
   return window.addEventListener("resize", o), {
     destroy: () => {
       e.remove(), o.clear(), window.removeEventListener("resize", o);
@@ -361,13 +374,13 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     },
     redraw: r
   };
-}, Zt = (t, e, n) => tt(t, e, n, Qt(t)), Jt = (t) => [
+}, Qt = (t, e, n) => tt(t, e, n, Gt(t)), Zt = (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(";"), te = () => {
+].filter(Boolean).join(";"), Jt = () => {
   const t = document.createElement("style");
   document.getElementsByTagName("head")[0].appendChild(t);
   let e = /* @__PURE__ */ new Set();
@@ -380,24 +393,24 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     },
     redraw: (s, i, c, l) => {
       l && l.clear();
-      const u = new Set(s.map((f) => f.annotation.id));
-      Array.from(e).filter((f) => !u.has(f));
-      const p = s.map((f) => {
+      const f = new Set(s.map((u) => u.annotation.id));
+      Array.from(e).filter((u) => !f.has(u));
+      const p = s.map((u) => {
         var L;
-        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)} }`;
+        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}) { ${Zt(d)} }`;
       });
       t.innerHTML = p.join(`
-`), 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;
+`), 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;
     }
   };
-}, 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) => {
+}, te = (t, e, n) => tt(t, e, n, Jt()), ee = (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(), ne = (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) => {
+}, oe = (t) => {
   t.classList.add("r6o-annotatable");
   const e = document.createElement("div");
   e.className = "r6o-span-highlight-layer", t.insertBefore(e, t.firstChild);
@@ -406,18 +419,18 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     destroy: () => {
       e.remove();
     },
-    redraw: (i, c, l, u, p) => {
+    redraw: (i, c, l, f, p) => {
       const g = !(gt(n, i) && p);
-      if (!u && !g) return;
+      if (!f && !g) return;
       g && (e.innerHTML = ""), [...i].sort((L, w) => {
         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 x = oe(w, i), R = Xt(L, c, l, u, x);
+          const x = ne(w, i), R = Yt(L, c, l, f, 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 = 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);
+            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 = ee(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;
@@ -426,10 +439,10 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       i ? e.classList.remove("hidden") : e.classList.add("hidden");
     }
   };
-}, 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) => {
+}, se = (t, e, n) => tt(t, e, n, oe(t)), ke = (t, e) => ({
+  parse: (n) => ae(n),
+  serialize: (n) => ce(n, t, e)
+}), re = (t) => t.quote !== void 0 && t.start !== void 0 && t.end !== void 0, ie = (t) => {
   const {
     id: e,
     creator: n,
@@ -449,18 +462,18 @@ const rt = "not-annotatable", W = `.${rt}`, z = (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((f, g) => {
+    const p = (Array.isArray(l.selector) ? l.selector : [l.selector]).reduce((u, g) => {
       switch (g.type) {
         case "TextQuoteSelector":
-          f.quote = g.exact;
+          u.quote = g.exact;
           break;
         case "TextPositionSelector":
-          f.start = g.start, f.end = g.end;
+          u.start = g.start, u.end = g.end;
           break;
       }
-      return f;
+      return u;
     }, {});
-    if (c.outdated || (c.outdated = "outdated" in l ? l.outdated : void 0), ie(p))
+    if (c.outdated || (c.outdated = "outdated" in l ? l.outdated : void 0), re(p))
       c.selector.push(
         {
           ...p,
@@ -470,22 +483,22 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
         }
       );
     else {
-      const f = [
+      const u = [
         p.start ? void 0 : "TextPositionSelector",
         p.quote ? void 0 : "TextQuoteSelector"
       ].filter(Boolean);
-      return { error: Error(`Missing selector types: ${f.join(" and ")} for annotation: ${t.id}`) };
+      return { error: Error(`Missing selector types: ${u.join(" and ")} for annotation: ${t.id}`) };
     }
   }
   return { parsed: c };
-}, ce = (t) => {
+}, ae = (t) => {
   const e = t.id || st(), {
     creator: n,
     created: r,
     modified: o,
     body: s,
     ...i
-  } = t, c = pt(s, e), l = ae(t);
+  } = t, c = pt(s, e), l = ie(t);
   return "error" in l ? { error: l.error } : {
     parsed: {
       ...i,
@@ -494,20 +507,20 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       target: l.parsed
     }
   };
-}, le = (t, e, n) => {
+}, ce = (t, e, n) => {
   const { bodies: r, target: o, ...s } = t, {
     selector: i,
     creator: c,
     created: l,
-    updated: u,
+    updated: f,
     ...p
-  } = o, f = i.map((g) => {
+  } = o, u = 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 } = Dt(R, n);
+      const { prefix: E, suffix: a } = Pt(R, n);
       C.prefix = E, C.suffix = a;
     }
     const N = {
@@ -532,15 +545,15 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     body: mt(t.bodies),
     creator: c,
     created: l == null ? void 0 : l.toISOString(),
-    modified: u == null ? void 0 : u.toISOString(),
-    target: f
+    modified: f == null ? void 0 : f.toISOString(),
+    target: u
   };
-}, de = (t, e, n, r) => {
+}, le = (t, e, n, r) => {
   const o = new xt(), s = /* @__PURE__ */ new Map(), i = Tt(), c = (a, m) => {
     const b = a.selector.flatMap((S) => {
       const A = P([S]) ? S.range : at(S, e).range;
-      return Ht(A);
-    }), h = Kt(b, n, r).map((S) => Vt(S, m));
+      return It(A);
+    }), h = Ft(b, n, r).map((S) => Wt(S, m));
     return h.map((S) => {
       const { x: A, y: T, width: B, height: y } = S;
       return {
@@ -554,18 +567,18 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
         }
       };
     });
-  }, l = () => [...s.values()], u = () => {
+  }, l = () => [...s.values()], f = () => {
     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));
-  }, f = (a) => {
+  }, u = (a) => {
     const m = s.get(a.annotation);
     m && (m.forEach((b) => o.remove(b)), s.delete(a.annotation));
   }, g = (a) => {
-    f(a), p(a);
+    u(a), p(a);
   }, d = (a, m = !0) => {
-    m && u();
+    m && f();
     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);
@@ -596,7 +609,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   };
   return {
     all: l,
-    clear: u,
+    clear: f,
     getAt: L,
     getAnnotationBounds: w,
     getAnnotationRects: x,
@@ -611,21 +624,21 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     recalculate: () => {
       d(t.all().map((a) => a.target), !0), i.emit("recalculate");
     },
-    remove: f,
+    remove: u,
     set: d,
     size: () => o.all().length,
     update: g,
     on: (a, m) => i.on(a, m)
   };
-}, fe = (t, e) => {
+}, de = (t, e) => {
   var C, N;
-  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 n = bt(), r = le(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 = 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;
-  }, u = (E, a = K.LOCAL) => {
+  }, f = (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);
@@ -633,7 +646,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
   }, p = (E, a = K.LOCAL) => {
     const m = q(E, t);
     n.updateTarget(m, a);
-  }, f = (E, a = K.LOCAL) => {
+  }, u = (E, a = K.LOCAL) => {
     const m = E.map((b) => q(b, t));
     n.bulkUpdateTargets(m, a);
   };
@@ -651,8 +664,8 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       ...n,
       addAnnotation: c,
       bulkAddAnnotations: l,
-      bulkUpdateTargets: f,
-      bulkUpsertAnnotations: u,
+      bulkUpdateTargets: u,
+      bulkUpsertAnnotations: f,
       getAnnotationBounds: d,
       getAnnotationRects: w,
       getIntersecting: L,
@@ -665,30 +678,30 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     hover: s,
     viewport: i
   };
-}, ue = () => {
+}, fe = () => {
   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 = ue(), r = n.getContext("2d");
+}, ue = (t, e = {}) => {
+  const n = fe(), r = n.getContext("2d");
   document.body.appendChild(n);
-  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));
+  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));
   }), {
     clear: () => {
-      const { width: p, height: f } = n;
-      r.clearRect(-0.5, -0.5, p + 1, f + 1);
+      const { width: p, height: u } = n;
+      r.clearRect(-0.5, -0.5, p + 1, u + 1);
     },
     destroy: () => {
       n.remove();
     },
-    paint: (p, f, g) => {
+    paint: (p, u, 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 + f.left, x = p.rects[0].y + f.top;
+        const { height: L } = p.rects[0], w = p.rects[0].x + u.left, x = p.rects[0].y + u.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), {
@@ -703,20 +716,20 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       p.scale(2, 2), p.translate(0.5, 0.5);
     }
   };
-}, nt = 300, lt = ["up", "down", "left", "right"], dt = kt ? "⌘+a" : "ctrl+a", me = [
+}, nt = 300, lt = ["up", "down", "left", "right"], dt = kt ? "⌘+a" : "ctrl+a", ge = [
   ...lt.map((t) => `shift+${t}`),
   dt
-], pe = (t, e, n) => {
+], me = (t, e, n) => {
   const { store: r, selection: o } = e;
   let s;
   const {
     annotatingEnabled: i,
     offsetReferenceSelector: c,
     selectionMode: l,
-    dismissOnNotAnnotatable: u = "NEVER"
+    dismissOnNotAnnotatable: f = "NEVER"
   } = n, p = (y) => s = y;
-  let f;
-  const g = (y) => f = y;
+  let u;
+  const g = (y) => u = y;
   let d, L, w, x = i;
   const R = (y) => {
     x = y, N.clear(), y || (d = void 0, L = void 0, w = void 0);
@@ -742,15 +755,15 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
       r.getAnnotation(d.annotation) && (o.clear(), r.deleteAnnotation(d.annotation));
       return;
     }
-    const M = I.map((k) => Wt(k, t));
-    if (M.every((k) => It(k))) return;
-    const O = M.flatMap((k) => _t(t, k.cloneRange()));
+    const M = I.map((k) => $t(k, t));
+    if (M.every((k) => _t(k))) return;
+    const O = M.flatMap((k) => Ht(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((k) => $t(k, t, c)),
+      selector: O.map((k) => Kt(k, t, c)),
       updated: /* @__PURE__ */ new Date()
     }, r.getAnnotation(d.annotation) ? r.updateTarget(d, K.LOCAL) : o.clear());
   }, 10), E = (y) => {
@@ -760,14 +773,14 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     const v = Q(y), I = () => {
       const { x: M, y: O } = t.getBoundingClientRect();
       if (z(t, v.target)) {
-        (typeof u == "function" ? u(v, t) : u === "ALWAYS") && o.clear();
+        (typeof f == "function" ? f(v, t) : f === "ALWAYS") && o.clear();
         return;
       }
       const H = v.target instanceof Node && t.contains(v.target) && r.getAt(
         v.clientX - M,
         v.clientY - O,
         l === "all",
-        f
+        u
       );
       if (H) {
         const { selected: k } = o, U = new Set(k.map((V) => V.id)), F = Array.isArray(H) ? H.map((V) => V.id) : [H.id];
@@ -804,7 +817,7 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     }, 100);
     document.addEventListener("selectionchange", v), C();
   };
-  Y(me.join(","), { element: t, keydown: !0, keyup: !1 }, (y) => {
+  Y(ge.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);
@@ -834,54 +847,54 @@ const rt = "not-annotatable", W = `.${rt}`, z = (t, e) => {
     setUser: p,
     setAnnotatingEnabled: R
   };
-}, he = (t, e) => ({
+}, pe = (t, e) => ({
   ...t,
   annotatingEnabled: t.annotatingEnabled ?? e.annotatingEnabled,
   user: t.user || e.user
 }), ot = "SPANS", Be = (t, e = {}) => {
   Nt(t), Bt(t);
-  const n = he(e, {
+  const n = pe(e, {
     annotatingEnabled: !0,
     user: Et()
-  }), 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)
+  }), r = de(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" : ot : n.renderer || ot, u = p === "SPANS" ? se(t, r, s) : p === "CSS_HIGHLIGHTS" ? te(t, r, s) : p === "CANVAS" ? Qt(t, r, s) : void 0;
+  if (!u)
     throw `Unknown renderer implementation: ${p}`;
-  console.debug(`Using ${p} renderer`), n.style && f.setStyle(n.style);
-  const g = pe(t, r, n);
-  g.setUser(u), g.setAnnotatingEnabled(n.annotatingEnabled);
-  const d = vt(r, c, n.adapter), L = () => u, w = (a) => {
+  console.debug(`Using ${p} renderer`), n.style && u.setStyle(n.style);
+  const g = me(t, r, n);
+  g.setUser(f), g.setAnnotatingEnabled(n.annotatingEnabled);
+  const d = vt(r, c, n.adapter), L = () => f, w = (a) => {
     g.setAnnotatingEnabled(
       a === void 0 ? !0 : a
     );
   }, x = (a) => {
-    f.setFilter(a), g.setFilter(a);
+    u.setFilter(a), g.setFilter(a);
   }, R = (a) => {
-    u = a, g.setUser(a);
+    f = a, g.setUser(a);
   }, C = (a) => {
-    a && (f.setPainter(ge(a, n.presence)), a.on("selectionChange", () => f.redraw()));
+    a && (u.setPainter(ue(a, n.presence)), a.on("selectionChange", () => u.redraw()));
   }, N = (a) => {
     a ? o.setSelected(a) : o.clear();
   };
   return {
     ...d,
     destroy: () => {
-      f.destroy(), g.destroy(), c.destroy();
+      u.destroy(), g.destroy(), c.destroy();
     },
     element: t,
     getUser: L,
     setAnnotatingEnabled: w,
     setFilter: x,
-    setStyle: f.setStyle.bind(f),
-    redraw: f.redraw.bind(f),
+    setStyle: u.setStyle.bind(u),
+    redraw: u.redraw.bind(u),
     setUser: R,
     setSelected: N,
     setPresenceProvider: C,
-    setVisible: f.setVisible.bind(f),
+    setVisible: u.setVisible.bind(u),
     on: l.on,
     off: l.off,
-    scrollIntoView: Yt(t, i),
+    scrollIntoView: Vt(t, i),
     state: r
   };
 };
@@ -897,39 +910,39 @@ export {
   X as cloneKeyboardEvent,
   Q as clonePointerEvent,
   _e as createBody,
-  Zt as createCanvasRenderer,
-  ee as createHighlightsRenderer,
-  ge as createPresencePainter,
-  te as createRenderer,
-  pe as createSelectionHandler,
-  re as createSpansRenderer,
+  Qt as createCanvasRenderer,
+  te as createHighlightsRenderer,
+  ue as createPresencePainter,
+  Jt as createRenderer,
+  me as createSelectionHandler,
+  se as createSpansRenderer,
   Be as createTextAnnotator,
-  fe as createTextAnnotatorState,
-  he as fillDefaults,
-  Ht as getHighlightClientRects,
-  Dt as getQuoteContext,
+  de as createTextAnnotatorState,
+  pe as fillDefaults,
+  It as getHighlightClientRects,
+  Pt as getQuoteContext,
   J as getRangeAnnotatableContents,
   kt as isMac,
-  Mt as isNodeWhitespaceOrEmpty,
+  Le as isNodeWhitespaceOrEmpty,
   z as isNotAnnotatable,
   Lt as isRangeAnnotatable,
-  It as isRangeWhitespaceOrEmpty,
+  _t as isRangeWhitespaceOrEmpty,
   P as isRevived,
-  Kt as mergeClientRects,
-  Xt as paint,
-  ce as parseW3CTextAnnotation,
+  Ft as mergeClientRects,
+  Yt as paint,
+  ae as parseW3CTextAnnotation,
   Bt as programmaticallyFocusable,
-  $t as rangeToSelector,
+  Kt as rangeToSelector,
   G as reviveAnnotation,
   at as reviveSelector,
   q as reviveTarget,
-  Yt as scrollIntoView,
-  le as serializeW3CTextAnnotation,
-  _t as splitAnnotatableRanges,
+  Vt as scrollIntoView,
+  ce as serializeW3CTextAnnotation,
+  Ht as splitAnnotatableRanges,
   Ne as toDomRectList,
-  Vt as toParentBounds,
+  Wt as toParentBounds,
   Oe as toViewportBounds,
-  Wt as trimRangeToContainer,
+  $t as trimRangeToContainer,
   it as whitespaceOrEmptyRegex
 };
 //# sourceMappingURL=text-annotator.es.js.map