@recogito/text-annotator 3.0.0-rc.19 → 3.0.0-rc.20

package/dist/src/TextAnnotatorOptions.d.ts

@@ -1,4 +1,4 @@
-import { HighlightStyleExpression } from './highlight/HighlightStyle';
+import { HighlightStyleExpression } from './highlight';
 import { TextAnnotation } from './model';
 import { PresencePainterOptions } from './presence';
 import { FormatAdapter, PointerSelectAction } from '@annotorious/core';

package/dist/src/highlight/baseRenderer.d.ts

@@ -7,7 +7,7 @@ import { Filter, ViewportState } from '@annotorious/core';
 
 export interface RendererImplementation {
     destroy(): void;
-    redraw(highlights: Highlight[], bounds: ViewportBounds, style?: HighlightStyleExpression, painter?: HighlightPainter, force?: boolean): void;
+    redraw(highlights: Highlight[], bounds: ViewportBounds, style?: HighlightStyleExpression, painter?: HighlightPainter, lazy?: boolean): void;
     setVisible(visible: boolean): void;
 }
 export interface Renderer {

package/dist/src/highlight/index.d.ts

@@ -1,3 +1,6 @@
+export * from './Highlight';
+export * from './HighlightStyle';
+export * from './HighlightPainter';
 export * from './canvas';
 export * from './highlights';
 export * from './span';

package/dist/src/index.d.ts

@@ -1,4 +1,4 @@
-import { _Origin } from '@annotorious/core';
+import { Origin as _Origin } from '@annotorious/core';
 export * from './highlight';
 export * from './model';
 export * from './state';

package/dist/src/utils/splitAnnotatableRanges.d.ts

@@ -1,3 +1,4 @@
+export declare const NOT_ANNOTATABLE_CLASS = "not-annotatable";
 export declare const NOT_ANNOTATABLE_SELECTOR = ".not-annotatable";
 /**
  * Splits a DOM Range into one or more ranges that span annotatable content only.

package/dist/text-annotator.es.js

@@ -1,13 +1,23 @@
-const dt = (t, e = 10) => {
+const D = {
+  fill: "rgb(0, 128, 255)",
+  fillOpacity: 0.18
+}, dt = {
+  fill: "rgb(0, 128, 255)",
+  fillOpacity: 0.45
+}, zt = (t, e, n, o, i) => {
+  var s;
+  const r = n ? typeof n == "function" ? n(t.annotation, t.state, i) : n : (s = t.state) != null && s.selected ? dt : D;
+  return o && o.paint(t, e) || r;
+}, ut = (t, e = 10) => {
   let n;
   return (...o) => {
     clearTimeout(n), n = setTimeout(() => t.apply(void 0, o), e);
   };
-}, Nt = "not-annotatable", D = `.${Nt}`, zt = (t) => {
+}, Nt = "not-annotatable", H = `.${Nt}`, Ft = (t) => {
   var n;
   const e = t.commonAncestorContainer;
-  return e instanceof HTMLElement ? !e.closest(D) : !((n = e.parentElement) != null && n.closest(D));
-}, Ft = function* (t) {
+  return e instanceof HTMLElement ? !e.closest(H) : !((n = e.parentElement) != null && n.closest(H));
+}, Wt = function* (t) {
   const e = document.createNodeIterator(
     t.commonAncestorContainer,
     NodeFilter.SHOW_ELEMENT,
@@ -16,12 +26,12 @@ const dt = (t, e = 10) => {
   let n;
   for (; n = e.nextNode(); )
     n instanceof HTMLElement && (yield n);
-}, Wt = (t) => {
-  if (!zt(t))
+}, qt = (t) => {
+  if (!Ft(t))
     return [];
   const e = [];
   let n = null;
-  for (const o of Ft(t)) {
+  for (const o of Wt(t)) {
     let i;
     n ? (i = document.createRange(), i.setStartAfter(n), i.setEndBefore(o)) : (i = t.cloneRange(), i.setEndBefore(o)), i.collapsed || e.push(i), n = o;
   }
@@ -32,10 +42,10 @@ const dt = (t, e = 10) => {
   return e.length > 0 ? e : [t];
 }, ct = (t) => {
   const e = t.cloneContents();
-  return e.querySelectorAll(D).forEach((n) => n.remove()), e;
+  return e.querySelectorAll(H).forEach((n) => n.remove()), e;
 }, wn = (t) => {
   const e = t.cloneContents();
-  return e.querySelectorAll(D).forEach((n) => n.remove()), e;
+  return e.querySelectorAll(H).forEach((n) => n.remove()), e;
 }, gt = (t, e) => {
   const n = document.createNodeIterator(e);
   let o = 0, i = n.nextNode();
@@ -50,7 +60,7 @@ const dt = (t, e = 10) => {
   for (let i = 0; i < t + 1; i++)
     o = n.nextNode();
   return o;
-}, qt = (t) => {
+}, jt = (t) => {
   const {
     commonAncestorContainer: e,
     startContainer: n,
@@ -76,14 +86,14 @@ const dt = (t, e = 10) => {
     c.selectNodeContents(n), c.setStart(n, o);
     const m = v(c), g = document.createRange();
     g.selectNode(i), g.setEnd(i, r);
-    const y = v(g), w = jt(t).reverse().map((l) => {
+    const y = v(g), w = Gt(t).reverse().map((l) => {
       var f;
       const d = document.createElement("SPAN");
       return (f = l.parentNode) == null || f.insertBefore(d, l), d.appendChild(l), d;
     });
     return { unwrap: h, nodes: [m, ...w, y] };
   }
-}, jt = (t) => {
+}, Gt = (t) => {
   const {
     commonAncestorContainer: e,
     startContainer: n,
@@ -99,10 +109,10 @@ const dt = (t, e = 10) => {
   if (e === n)
     return Array.from(t.getClientRects());
   {
-    const { unwrap: o, nodes: i } = qt(t), r = i.reduce((s, a) => [...s, ...a.getClientRects()], []);
+    const { unwrap: o, nodes: i } = jt(t), r = i.reduce((s, a) => [...s, ...a.getClientRects()], []);
     return o(), r;
   }
-}, Gt = (t, e, n = 10, o) => {
+}, Kt = (t, e, n = 10, o) => {
   const i = o ? t.startContainer.parentElement.closest(o) : e, r = document.createRange();
   r.setStart(i, 0), r.setEnd(t.startContainer, t.startOffset);
   const s = ct(r).textContent, a = document.createRange();
@@ -112,7 +122,7 @@ const dt = (t, e = 10) => {
     prefix: s.substring(s.length - n),
     suffix: u.substring(0, n)
   };
-}, k = (t) => t.every((e) => e.range instanceof Range && !e.range.collapsed), Kt = (t, e) => {
+}, k = (t) => t.every((e) => e.range instanceof Range && !e.range.collapsed), Qt = (t, e) => {
   const n = (r) => Math.round(r * 10) / 10, o = {
     top: n(t.top),
     bottom: n(t.bottom),
@@ -136,17 +146,17 @@ const dt = (t, e = 10) => {
       return "block-contains";
   } else if (o.top >= i.top && o.bottom <= i.bottom && o.left >= i.left && o.right <= i.right)
     return "block-is-contained";
-}, Qt = (t, e) => {
+}, Jt = (t, e) => {
   const n = Math.min(t.left, e.left), o = Math.max(t.right, e.right), i = Math.min(t.top, e.top), r = Math.max(t.bottom, e.bottom);
   return new DOMRect(n, i, o - n, r - i);
-}, Jt = (t) => t.reduce((e, n) => {
+}, Zt = (t) => t.reduce((e, n) => {
   if (n.width === 0 || n.height === 0)
     return e;
   let o = [...e], i = !1;
   for (const r of e) {
-    const s = Kt(n, r);
+    const s = Qt(n, r);
     if (s === "inline-adjacent") {
-      o = o.map((a) => a === r ? Qt(n, r) : a), i = !0;
+      o = o.map((a) => a === r ? Jt(n, r) : a), i = !0;
       break;
     } else if (s === "inline-contains") {
       o = o.map((a) => a === r ? n : a), i = !0;
@@ -160,7 +170,7 @@ const dt = (t, e = 10) => {
     }
   }
   return i ? o : [...o, n];
-}, []), Zt = (t, e, n) => {
+}, []), te = (t, e, n) => {
   const o = document.createRange(), i = n ? t.startContainer.parentElement.closest(n) : e;
   o.setStart(i, 0), o.setEnd(t.startContainer, t.startOffset);
   const r = ct(o).textContent, s = t.toString(), a = r.length || 0, u = a + s.length;
@@ -172,7 +182,7 @@ const dt = (t, e = 10) => {
     NodeFilter.SHOW_TEXT,
     (m) => {
       var g;
-      return (g = m.parentElement) != null && g.closest(D) ? NodeFilter.FILTER_SKIP : NodeFilter.FILTER_ACCEPT;
+      return (g = m.parentElement) != null && g.closest(H) ? NodeFilter.FILTER_SKIP : NodeFilter.FILTER_ACCEPT;
     }
   );
   let s = 0;
@@ -206,7 +216,7 @@ const dt = (t, e = 10) => {
 }, Z = (t, e) => k(t.selector) ? t : {
   ...t,
   selector: t.selector.map((n) => n.range instanceof Range && !n.range.collapsed ? n : Bt(n, e))
-}, tt = (t, e) => k(t.target.selector) ? t : { ...t, target: Z(t.target, e) }, te = (t) => {
+}, tt = (t, e) => k(t.target.selector) ? t : { ...t, target: Z(t.target, e) }, ee = (t) => {
   var i;
   const { startContainer: e, endContainer: n } = t;
   if (e.nodeType === Node.TEXT_NODE && n.nodeType === Node.TEXT_NODE)
@@ -220,16 +230,10 @@ const dt = (t, e = 10) => {
     t.setEnd(s, ((i = s == null ? void 0 : s.textContent) == null ? void 0 : i.length) || 0);
   }
   return t;
-}, H = {
-  fill: "rgb(0, 128, 255)",
-  fillOpacity: 0.18
-}, ut = {
-  fill: "rgb(0, 128, 255)",
-  fillOpacity: 0.45
-}, ee = (t) => {
+}, ne = (t) => {
   const { top: e, left: n } = t.getBoundingClientRect(), { innerWidth: o, innerHeight: i } = window, r = -n, s = -e, a = o - n, u = i - e;
   return { top: e, left: n, minX: r, minY: s, maxX: a, maxY: u };
-}, ne = (t) => {
+}, oe = (t) => {
   let e = /* @__PURE__ */ new Set();
   return (o) => {
     const i = o.map((r) => r.id);
@@ -238,14 +242,14 @@ const dt = (t, e = 10) => {
 }, ht = (t, e, n, o) => {
   const { store: i, selection: r, hover: s } = e;
   let a, u, h;
-  const v = ne(n), c = (p) => {
+  const v = oe(n), c = (p) => {
     const { x: S, y: E } = t.getBoundingClientRect(), C = i.getAt(p.clientX - S, p.clientY - E);
     C && (!u || u(C)) ? s.current !== C.id && (t.classList.add("hovered"), s.set(C.id)) : s.current && (t.classList.remove("hovered"), s.set(null));
   };
   t.addEventListener("pointermove", c);
-  const m = (p = !1) => {
+  const m = (p = !0) => {
     h && h.clear();
-    const S = ee(t), { minX: E, minY: C, maxX: L, maxY: B } = S, _ = u ? i.getIntersecting(E, C, L, B).filter(({ annotation: U }) => u(U)) : i.getIntersecting(E, C, L, B), Yt = r.selected.map(({ id: U }) => U), Dt = _.map(({ annotation: U, rects: Ht }) => {
+    const S = ne(t), { minX: E, minY: C, maxX: L, maxY: B } = S, _ = u ? i.getIntersecting(E, C, L, B).filter(({ annotation: U }) => u(U)) : i.getIntersecting(E, C, L, B), Yt = r.selected.map(({ id: U }) => U), Dt = _.map(({ annotation: U, rects: Ht }) => {
       const $t = Yt.includes(U.id), Pt = U.id === s.current;
       return { annotation: U, rects: Ht, state: { selected: $t, hover: Pt, custom: {} } };
     });
@@ -258,9 +262,9 @@ const dt = (t, e = 10) => {
     u = p, m();
   }, w = () => m();
   i.observe(w);
-  const l = r.subscribe(() => m()), d = () => m();
+  const l = r.subscribe(() => m()), d = () => m(!0);
   document.addEventListener("scroll", d, { capture: !0, passive: !0 });
-  const f = dt(() => {
+  const f = ut(() => {
     i.recalculatePositions(), h && h.reset(), m();
   });
   window.addEventListener("resize", f);
@@ -279,17 +283,17 @@ const dt = (t, e = 10) => {
     setPainter: g,
     setVisible: o.setVisible
   };
-}, oe = () => {
+}, ie = () => {
   const t = document.createElement("canvas");
   return t.width = window.innerWidth, t.height = window.innerHeight, t.className = "r6o-highlight-layer bg", t;
-}, ie = (t, e) => {
+}, re = (t, e) => {
   if (t.width = e ? 2 * window.innerWidth : window.innerWidth, t.height = e ? 2 * window.innerHeight : window.innerHeight, e) {
     const n = t.getContext("2d");
     n.scale(2, 2), n.translate(0.5, 0.5);
   }
-}, re = (t) => {
+}, se = (t) => {
   t.classList.add("r6o-annotatable");
-  const e = oe(), n = e.getContext("2d");
+  const e = ie(), n = e.getContext("2d");
   t.insertBefore(e, t.firstChild);
   const o = (a, u, h, v) => requestAnimationFrame(() => {
     const { width: c, height: m } = e;
@@ -297,7 +301,7 @@ const dt = (t, e = 10) => {
     const { top: g, left: y } = u;
     a.forEach((x) => {
       var f;
-      const w = h ? typeof h == "function" ? h(x.annotation, x.state) : h : (f = x.state) != null && f.selected ? ut : H, l = v && v.paint(x, u) || w, d = x.rects.map(({ x: b, y: A, width: R, height: T }) => ({
+      const w = h ? typeof h == "function" ? h(x.annotation, x.state) : h : (f = x.state) != null && f.selected ? dt : D, l = v && v.paint(x, u) || w, d = x.rects.map(({ x: b, y: A, width: R, height: T }) => ({
         x: b + y,
         y: A + g,
         width: R,
@@ -307,8 +311,8 @@ const dt = (t, e = 10) => {
         n.beginPath(), n.moveTo(b, A + T + 4), n.lineTo(b + R, A + T + 4), n.stroke();
       }));
     });
-  }), i = dt(() => {
-    ie(e);
+  }), i = ut(() => {
+    re(e);
   });
   return window.addEventListener("resize", i), {
     destroy: () => {
@@ -319,8 +323,8 @@ const dt = (t, e = 10) => {
     },
     redraw: o
   };
-}, se = (t, e, n) => ht(t, e, n, re(t));
-var ae = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
+}, ae = (t, e, n) => ht(t, e, n, se(t));
+var ce = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
   return typeof t == "string" ? t.length > 0 : typeof t == "number";
 }, O = function(t, e, n) {
   return e === void 0 && (e = 0), n === void 0 && (n = Math.pow(10, e)), Math.round(n * t) / n + 0;
@@ -332,7 +336,7 @@ var ae = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
   return { r: I(t.r, 0, 255), g: I(t.g, 0, 255), b: I(t.b, 0, 255), a: I(t.a) };
 }, et = function(t) {
   return { r: O(t.r), g: O(t.g), b: O(t.b), a: O(t.a, 3) };
-}, ce = /^#([0-9a-f]{3,8})$/i, G = function(t) {
+}, le = /^#([0-9a-f]{3,8})$/i, G = function(t) {
   var e = t.toString(16);
   return e.length < 2 ? "0" + e : e;
 }, Mt = function(t) {
@@ -353,17 +357,17 @@ var ae = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
 }, j = function(t) {
   return { h: (e = Mt(t)).h, s: (i = (200 - (n = e.s)) * (o = e.v) / 100) > 0 && i < 200 ? n * o / 100 / (i <= 100 ? i : 200 - i) * 100 : 0, l: i / 2, a: e.a };
   var e, n, o, i;
-}, le = /^hsla?\(\s*([+-]?\d*\.?\d+)(deg|rad|grad|turn)?\s*,\s*([+-]?\d*\.?\d+)%\s*,\s*([+-]?\d*\.?\d+)%\s*(?:,\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, de = /^hsla?\(\s*([+-]?\d*\.?\d+)(deg|rad|grad|turn)?\s+([+-]?\d*\.?\d+)%\s+([+-]?\d*\.?\d+)%\s*(?:\/\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, ue = /^rgba?\(\s*([+-]?\d*\.?\d+)(%)?\s*,\s*([+-]?\d*\.?\d+)(%)?\s*,\s*([+-]?\d*\.?\d+)(%)?\s*(?:,\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, he = /^rgba?\(\s*([+-]?\d*\.?\d+)(%)?\s+([+-]?\d*\.?\d+)(%)?\s+([+-]?\d*\.?\d+)(%)?\s*(?:\/\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, yt = { string: [[function(t) {
-  var e = ce.exec(t);
+}, de = /^hsla?\(\s*([+-]?\d*\.?\d+)(deg|rad|grad|turn)?\s*,\s*([+-]?\d*\.?\d+)%\s*,\s*([+-]?\d*\.?\d+)%\s*(?:,\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, ue = /^hsla?\(\s*([+-]?\d*\.?\d+)(deg|rad|grad|turn)?\s+([+-]?\d*\.?\d+)%\s+([+-]?\d*\.?\d+)%\s*(?:\/\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, he = /^rgba?\(\s*([+-]?\d*\.?\d+)(%)?\s*,\s*([+-]?\d*\.?\d+)(%)?\s*,\s*([+-]?\d*\.?\d+)(%)?\s*(?:,\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, fe = /^rgba?\(\s*([+-]?\d*\.?\d+)(%)?\s+([+-]?\d*\.?\d+)(%)?\s+([+-]?\d*\.?\d+)(%)?\s*(?:\/\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i, yt = { string: [[function(t) {
+  var e = le.exec(t);
   return e ? (t = e[1]).length <= 4 ? { r: parseInt(t[0] + t[0], 16), g: parseInt(t[1] + t[1], 16), b: parseInt(t[2] + t[2], 16), a: t.length === 4 ? O(parseInt(t[3] + t[3], 16) / 255, 2) : 1 } : t.length === 6 || t.length === 8 ? { r: parseInt(t.substr(0, 2), 16), g: parseInt(t.substr(2, 2), 16), b: parseInt(t.substr(4, 2), 16), a: t.length === 8 ? O(parseInt(t.substr(6, 2), 16) / 255, 2) : 1 } : null : null;
 }, "hex"], [function(t) {
-  var e = ue.exec(t) || he.exec(t);
+  var e = he.exec(t) || fe.exec(t);
   return e ? e[2] !== e[4] || e[4] !== e[6] ? null : mt({ r: Number(e[1]) / (e[2] ? 100 / 255 : 1), g: Number(e[3]) / (e[4] ? 100 / 255 : 1), b: Number(e[5]) / (e[6] ? 100 / 255 : 1), a: e[7] === void 0 ? 1 : Number(e[7]) / (e[8] ? 100 : 1) }) : null;
 }, "rgb"], [function(t) {
-  var e = le.exec(t) || de.exec(t);
+  var e = de.exec(t) || ue.exec(t);
   if (!e)
     return null;
-  var n, o, i = bt({ h: (n = e[1], o = e[2], o === void 0 && (o = "deg"), Number(n) * (ae[o] || 1)), s: Number(e[3]), l: Number(e[4]), a: e[5] === void 0 ? 1 : Number(e[5]) / (e[6] ? 100 : 1) });
+  var n, o, i = bt({ h: (n = e[1], o = e[2], o === void 0 && (o = "deg"), Number(n) * (ce[o] || 1)), s: Number(e[3]), l: Number(e[4]), a: e[5] === void 0 ? 1 : Number(e[5]) / (e[6] ? 100 : 1) });
   return wt(i);
 }, "hsl"]], object: [[function(t) {
   var e = t.r, n = t.g, o = t.b, i = t.a, r = i === void 0 ? 1 : i;
@@ -389,7 +393,7 @@ var ae = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
       return [o, e[n][1]];
   }
   return [null, void 0];
-}, fe = function(t) {
+}, ge = function(t) {
   return typeof t == "string" ? xt(t.trim(), yt.string) : typeof t == "object" && t !== null ? xt(t, yt.object) : [null, void 0];
 }, nt = function(t, e) {
   var n = j(t);
@@ -401,7 +405,7 @@ var ae = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
   return { h: n.h, s: n.s, l: I(n.l + 100 * e, 0, 100), a: n.a };
 }, Et = function() {
   function t(e) {
-    this.parsed = fe(e)[0], this.rgba = this.parsed || { r: 0, g: 0, b: 0, a: 1 };
+    this.parsed = ge(e)[0], this.rgba = this.parsed || { r: 0, g: 0, b: 0, a: 1 };
   }
   return t.prototype.isValid = function() {
     return this.parsed !== null;
@@ -454,13 +458,13 @@ var ae = { grad: 0.9, turn: 360, rad: 360 / (2 * Math.PI) }, X = function(t) {
 }(), V = function(t) {
   return t instanceof Et ? t : new Et(t);
 };
-const ge = (t) => [
-  `background-color:${V((t == null ? void 0 : t.fill) || H.fill).alpha((t == null ? void 0 : t.fillOpacity) === void 0 ? H.fillOpacity : t.fillOpacity).toHex()}`,
+const pe = (t) => [
+  `background-color:${V((t == null ? void 0 : t.fill) || D.fill).alpha((t == null ? void 0 : t.fillOpacity) === void 0 ? D.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(";"), pe = () => {
+].filter(Boolean).join(";"), me = () => {
   const t = document.createElement("style");
   document.getElementsByTagName("head")[0].appendChild(t);
   let e = /* @__PURE__ */ new Set();
@@ -477,8 +481,8 @@ const ge = (t) => [
       Array.from(e).filter((c) => !h.has(c));
       const v = r.map((c) => {
         var y;
-        const m = a ? typeof a == "function" ? a(c.annotation, c.state) : a : (y = c.state) != null && y.selected ? ut : H, g = u && u.paint(c, s) || m;
-        return `::highlight(_${c.annotation.id}) { ${ge(g)} }`;
+        const m = a ? typeof a == "function" ? a(c.annotation, c.state) : a : (y = c.state) != null && y.selected ? dt : D, g = u && u.paint(c, s) || m;
+        return `::highlight(_${c.annotation.id}) { ${pe(g)} }`;
       });
       t.innerHTML = v.join(`
 `), CSS.highlights.clear(), r.forEach(({ annotation: c }) => {
@@ -487,7 +491,7 @@ const ge = (t) => [
       }), e = h;
     }
   };
-}, me = (t, e, n) => ht(t, e, n, pe());
+}, be = (t, e, n) => ht(t, e, n, me());
 var St = Object.prototype.hasOwnProperty;
 function lt(t, e) {
   var n, o;
@@ -514,11 +518,7 @@ function lt(t, e) {
   }
   return t !== t && e !== e;
 }
-const be = (t, e, n, o, i) => {
-  var s;
-  const r = n ? typeof n == "function" ? n(t.annotation, t.state, i) : n : (s = t.state) != null && s.selected ? ut : H;
-  return o && o.paint(t, e) || r;
-}, ve = (t, e) => {
+const ve = (t, e) => {
   const n = (o, i) => o.x <= i.x + i.width && o.x + o.width >= i.x && o.y <= i.y + i.height && o.y + o.height >= i.y;
   return e.filter((o) => t !== o && n(t, o) && o.width > t.width).length;
 }, we = (t) => {
@@ -531,7 +531,7 @@ const be = (t, e, n, o, i) => {
       e.remove();
     },
     redraw: (s, a, u, h, v) => {
-      if (lt(n, s) && !v)
+      if (lt(n, s) && v)
         return;
       e.innerHTML = "";
       const m = s.reduce((g, { rects: y }) => [...g, ...y], []);
@@ -539,7 +539,7 @@ const be = (t, e, n, o, i) => {
         const y = g.rects.map((x) => {
           const w = document.createElement("span");
           w.className = "r6o-annotation", w.dataset.annotation = g.annotation.id, w.style.left = `${x.x}px`, w.style.top = `${x.y}px`, w.style.width = `${x.width}px`, w.style.height = `${x.height}px`;
-          const l = ve(x, m), d = be(g, a, u, h, l), f = V((d == null ? void 0 : d.fill) || H.fill).alpha((d == null ? void 0 : d.fillOpacity) === void 0 ? H.fillOpacity : d.fillOpacity).toHex();
+          const l = ve(x, m), d = zt(g, a, u, h, l), f = V((d == null ? void 0 : d.fill) || D.fill).alpha((d == null ? void 0 : d.fillOpacity) === void 0 ? D.fillOpacity : d.fillOpacity).toHex();
           return w.style.backgroundColor = f, d.underlineStyle && (w.style.borderStyle = d.underlineStyle), d.underlineColor && (w.style.borderColor = d.underlineColor), d.underlineThickness && (w.style.borderBottomWidth = `${d.underlineThickness}px`), d.underlineOffset && (w.style.paddingBottom = `${d.underlineOffset}px`), e.appendChild(w), w;
         });
         return { id: g.annotation.id, spans: y };
@@ -1254,7 +1254,7 @@ const xn = (t, e) => ({
     updated: h,
     ...v
   } = i, c = s.map((m) => {
-    const { quote: g, start: y, end: x, range: w } = m, { prefix: l, suffix: d } = Gt(w, n), f = [{
+    const { quote: g, start: y, end: x, range: w } = m, { prefix: l, suffix: d } = Kt(w, n), f = [{
       type: "TextQuoteSelector",
       exact: g,
       prefix: l,
@@ -1568,7 +1568,7 @@ const fn = (t, e) => {
     const f = l.selector.flatMap((A) => {
       const T = A.range instanceof Range && !A.range.collapsed && A.range.startContainer.nodeType === Node.TEXT_NODE && A.range.endContainer.nodeType === Node.TEXT_NODE ? A.range : Bt(A, e).range;
       return Array.from(T.getClientRects());
-    }), b = Jt(f).map(({ left: A, top: R, right: T, bottom: p }) => new DOMRect(A - d.left, R - d.top, T - A, p - R));
+    }), b = Zt(f).map(({ left: A, top: R, right: T, bottom: p }) => new DOMRect(A - d.left, R - d.top, T - A, p - R));
     return b.map((A) => {
       const { x: R, y: T, width: p, height: S } = A;
       return {
@@ -1761,7 +1761,7 @@ const fn = (t, e) => {
     var l;
     if (!u)
       return;
-    !((l = x.target.parentElement) != null && l.closest(D)) ? s = {
+    !((l = x.target.parentElement) != null && l.closest(H)) ? s = {
       annotation: Vt(),
       selector: [],
       creator: r,
@@ -1769,17 +1769,17 @@ const fn = (t, e) => {
     } : s = void 0;
   };
   t.addEventListener("selectstart", v);
-  const c = dt((x) => {
+  const c = ut((x) => {
     const w = document.getSelection();
     if (x.timeStamp - ((h == null ? void 0 : h.timeStamp) || x.timeStamp) < 1e3 && !s && v(h), w.isCollapsed || !u || !s)
       return;
-    const l = w.getRangeAt(0), d = te(l.cloneRange()), f = Wt(d);
+    const l = w.getRangeAt(0), d = ee(l.cloneRange()), f = qt(d);
     (f.length !== s.selector.length || f.some((A, R) => {
       var T;
       return A.toString() !== ((T = s.selector[R]) == null ? void 0 : T.quote);
     })) && (s = {
       ...s,
-      selector: f.map((A) => Zt(A, t, n))
+      selector: f.map((A) => te(A, t, n))
     }, o.getAnnotation(s.annotation) ? o.updateTarget(s, N.LOCAL) : (o.addAnnotation({
       id: s.annotation,
       bodies: [],
@@ -1794,7 +1794,7 @@ const fn = (t, e) => {
   t.addEventListener("pointerdown", m);
   const g = (x) => {
     var f;
-    if (!!((f = x.target.parentElement) != null && f.closest(D)) || !u)
+    if (!!((f = x.target.parentElement) != null && f.closest(H)) || !u)
       return;
     const l = () => {
       const { x: b, y: A } = t.getBoundingClientRect(), R = o.getAt(x.clientX - b, x.clientY - A);
@@ -1820,10 +1820,10 @@ const fn = (t, e) => {
     e.adapter
   );
   let u = Ke();
-  const h = e.renderer === "CSS_HIGHLIGHTS" ? CSS.highlights ? "CSS_HIGHLIGHTS" : Lt : e.renderer || Lt, v = h === "SPANS" ? ye(t, n, i) : h === "CSS_HIGHLIGHTS" ? me(t, n, i) : h === "CANVAS" ? se(t, n, i) : void 0;
+  const h = e.renderer === "CSS_HIGHLIGHTS" ? CSS.highlights ? "CSS_HIGHLIGHTS" : Lt : e.renderer || Lt, v = h === "SPANS" ? ye(t, n, i) : h === "CSS_HIGHLIGHTS" ? be(t, n, i) : h === "CANVAS" ? ae(t, n, i) : void 0;
   if (!v)
     throw `Unknown renderer implementation: ${h}`;
-  console.log(`Using ${h} renderer`), e.style && v.setStyle(e.style);
+  console.debug(`Using ${h} renderer`), e.style && v.setStyle(e.style);
   const c = vn(t, n, e.offsetReferenceSelector);
   return c.setUser(u), {
     ...ze(n, s, e.adapter),
@@ -1841,7 +1841,7 @@ const fn = (t, e) => {
       A ? o.setSelected(A) : o.clear();
     },
     setPresenceProvider: (A) => {
-      A && (v.setPainter(mn(t, A, e.presence)), A.on("selectionChange", () => v.redraw(!0)));
+      A && (v.setPainter(mn(t, A, e.presence)), A.on("selectionChange", () => v.redraw()));
     },
     setVisible: (A) => v.setVisible(A),
     on: a.on,
@@ -1851,29 +1851,33 @@ const fn = (t, e) => {
   };
 };
 export {
-  D as NOT_ANNOTATABLE_SELECTOR,
+  dt as DEFAULT_SELECTED_STYLE,
+  D as DEFAULT_STYLE,
+  Nt as NOT_ANNOTATABLE_CLASS,
+  H as NOT_ANNOTATABLE_SELECTOR,
   N as Origin,
   xn as W3CTextFormat,
-  se as createCanvasRenderer,
-  me as createHighlightsRenderer,
-  pe as createRenderer,
+  ae as createCanvasRenderer,
+  be as createHighlightsRenderer,
+  me as createRenderer,
   ye as createSpansRenderer,
   An as createTextAnnotator,
   gn as createTextAnnotatorState,
-  dt as debounce,
+  ut as debounce,
   wn as getAnnotatableFragment,
   yn as getClientRectsPonyfill,
-  Gt as getQuoteContext,
+  Kt as getQuoteContext,
   ct as getRangeAnnotatableContents,
   k as isRevived,
-  Jt as mergeClientRects,
+  Zt as mergeClientRects,
+  zt as paint,
   nn as parseW3CTextAnnotation,
-  Zt as rangeToSelector,
+  te as rangeToSelector,
   tt as reviveAnnotation,
   Bt as reviveSelector,
   Z as reviveTarget,
   on as serializeW3CTextAnnotation,
-  Wt as splitAnnotatableRanges,
-  te as trimRange
+  qt as splitAnnotatableRanges,
+  ee as trimRange
 };
 //# sourceMappingURL=text-annotator.es.js.map