@soomo/text-annotator 3.4.12-staging.0 → 3.4.14-staging.0

package/dist/model/w3c/W3CTextAnnotation.d.ts

@@ -5,9 +5,10 @@ export interface W3CTextAnnotation extends W3CAnnotation {
 }
 export interface W3CTextAnnotationTarget extends W3CAnnotationTarget {
     selector: W3CTextSelector | W3CTextSelector[];
-    outdated?: boolean;
     styleClass?: string;
     scope?: string;
+    outdated?: boolean;
+    migrationPending?: boolean;
 }
 /**
  * Matches the `Text Quote Selector` spec

package/dist/text-annotator.css

@@ -1 +1 @@
-.r6o-canvas-highlight-layer{position:fixed;top:0;bottom:0;left:0;width:100vw;height:100vh;pointer-events:none}.r6o-canvas-highlight-layer.bg{mix-blend-mode:multiply;z-index:1}.r6o-annotatable .r6o-span-highlight-layer{position:absolute;top:0;left:0;width:100%;height:100%;mix-blend-mode:multiply;pointer-events:none;overflow:hidden;z-index:1}.r6o-annotatable .r6o-span-highlight-layer.hidden{display:none}.r6o-annotatable .r6o-span-highlight-layer .r6o-annotation{position:absolute;display:block;border-style:solid;border-width:0;box-sizing:content-box}.r6o-presence-layer{left:0;position:fixed;top:0;bottom:0;width:100vw;pointer-events:none}html,body{overscroll-behavior-y:none}.r6o-annotatable{position:relative;-webkit-tap-highlight-color:transparent}.r6o-annotatable.no-focus-outline{outline:none}.hovered *{cursor:pointer}*::selection,::selection{background:#0080ff2e}::-moz-selection{background:#0080ff2e}
+.r6o-canvas-highlight-layer{position:fixed;top:0;bottom:0;left:0;width:100vw;height:100vh;pointer-events:none}.r6o-canvas-highlight-layer.bg{mix-blend-mode:multiply;z-index:1}.r6o-annotatable .r6o-span-highlight-layer{position:absolute;top:0;left:0;width:100%;height:100%;mix-blend-mode:multiply;pointer-events:none;overflow:hidden;user-select:none;-webkit-user-select:none;z-index:1}.r6o-annotatable .r6o-span-highlight-layer.hidden{display:none}.r6o-annotatable .r6o-span-highlight-layer .r6o-annotation{position:absolute;display:block;border-style:solid;border-width:0;box-sizing:content-box}.r6o-presence-layer{left:0;position:fixed;top:0;bottom:0;width:100vw;pointer-events:none}html,body{overscroll-behavior-y:none}.r6o-annotatable{position:relative;-webkit-tap-highlight-color:transparent}.r6o-annotatable.no-focus-outline{outline:none}.hovered *{cursor:pointer}*::selection,::selection{background:#0080ff2e}::-moz-selection{background:#0080ff2e}

package/dist/text-annotator.es.js

@@ -1,5 +1,5 @@
 import de from "debounce";
-import { UserSelectAction as Ce, serializeW3CBodies as Se, parseW3CBodies as Ae, parseW3CUser as we, createStore as Re, createSelectionState as Te, createHoverState as ve, createViewportState as xe, Origin as K, createAnonymousGuest as Le, createUndoStack as Ne, createLifecycleObserver as Oe, createBaseAnnotator as Be } from "@annotorious/core";
+import { UserSelectAction as Ce, parseW3CBodies as Se, serializeW3CBodies as Ae, parseW3CUser as we, createStore as Re, createSelectionState as Te, createHoverState as ve, createViewportState as xe, Origin as K, createAnonymousGuest as Le, createUndoStack as Ne, createLifecycleObserver as Oe, createBaseAnnotator as Be } from "@annotorious/core";
 import { Origin as Ut, UserSelectAction as Kt, createBody as Wt } from "@annotorious/core";
 import { colord as ne } from "colord";
 import { dequal as ke } from "dequal/lite";
@@ -11,7 +11,7 @@ import { poll as _e } from "poll";
 const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t instanceof HTMLElement ? t.closest($) : t.parentElement?.closest($)) : !0, ge = (e, t) => {
   const n = t.commonAncestorContainer;
   return !W(e, n);
-}, He = (e) => e.addEventListener("click", (t) => {
+}, Pe = (e) => e.addEventListener("click", (t) => {
   // Allow clicks within not-annotatable elements
   !t.target.closest($) && !t.target.closest("a") && t.preventDefault();
 }), J = (e) => ({
@@ -61,9 +61,9 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
   return ((...r) => {
     clearTimeout(n), n = setTimeout(() => e.apply(void 0, r), t);
   });
-}, me = typeof navigator < "u" && navigator.platform.startsWith("Mac"), De = (e) => {
+}, me = typeof navigator < "u" && navigator.platform.startsWith("Mac"), He = (e) => {
   (!e.hasAttribute("tabindex") || e.tabIndex < -1) && e.setAttribute("tabindex", "-1"), e.classList.add("no-focus-outline");
-}, Pe = (e) => {
+}, De = (e) => {
   const t = [], n = document.createNodeIterator(
     e.commonAncestorContainer,
     NodeFilter.SHOW_TEXT
@@ -293,7 +293,7 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
   e.addEventListener("pointermove", d);
   const y = ee((A = !1) => requestAnimationFrame(() => {
     f && f.clear();
-    const v = Qe(e), { minX: N, minY: O, maxX: P, maxY: X } = v, z = l ? s.getIntersecting(N, O, P, X).filter(({ annotation: p }) => l(p)) : s.getIntersecting(N, O, P, X), F = o.selected.map(({ id: p }) => p), re = z.map(({ annotation: p, rects: T }) => {
+    const v = Qe(e), { minX: N, minY: O, maxX: D, maxY: X } = v, z = l ? s.getIntersecting(N, O, D, X).filter(({ annotation: p }) => l(p)) : s.getIntersecting(N, O, D, X), F = o.selected.map(({ id: p }) => p), re = z.map(({ annotation: p, rects: T }) => {
       const k = F.includes(p.id), U = p.id === i.current;
       return {
         annotation: p,
@@ -415,7 +415,7 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
 }, lt = (e) => {
   e.classList.add("r6o-annotatable");
   const t = document.createElement("div");
-  t.className = "r6o-span-highlight-layer", e.insertBefore(t, e.firstChild);
+  t.className = "r6o-span-highlight-layer", e.appendChild(t);
   let n = [];
   return {
     destroy: () => {
@@ -475,7 +475,7 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
       }
       return d;
     }, {});
-    if (c.outdated ||= "outdated" in l ? l.outdated : void 0, ut(u))
+    if (c.outdated ||= "outdated" in l ? l.outdated : void 0, c.migrationPending ||= "migrationPending" in l ? l.migrationPending : void 0, ut(u))
       c.selector.push(
         {
           ...u,
@@ -500,7 +500,7 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
     modified: s,
     body: o,
     ...i
-  } = e, c = Ae(o, t), l = ft(e);
+  } = e, c = Se(o, t), l = ft(e);
   return "error" in l ? { error: l.error } : {
     parsed: {
       ...i,
@@ -544,7 +544,7 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
     "@context": "http://www.w3.org/ns/anno.jsonld",
     id: e.id,
     type: "Annotation",
-    body: Se(e.bodies),
+    body: Ae(e.bodies),
     creator: c,
     created: l?.toISOString(),
     modified: f?.toISOString(),
@@ -592,15 +592,15 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
   const s = new Me(), o = /* @__PURE__ */ new Map(), i = Ie(), c = (m, a) => {
     const C = m.selector.flatMap((A) => {
       const v = I([A]) ? A.range : he(A, t).range;
-      return Pe(v);
+      return De(v);
     }), L = Ye(C, n, r).map((A) => je(A, a));
     return L.map((A) => {
-      const { x: v, y: N, width: O, height: P } = A;
+      const { x: v, y: N, width: O, height: D } = A;
       return {
         minX: v,
         minY: N,
         maxX: v + O,
-        maxY: N + P,
+        maxY: N + D,
         annotation: {
           id: m.annotation,
           rects: L
@@ -779,9 +779,9 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
       s.getAnnotation(g.annotation) && !(a(b) || w === "REPLACE_CURRENT") && (o.clear(), s.deleteAnnotation(g.annotation));
       return;
     }
-    const H = k.map((B) => qe(B, e));
-    if (H.every((B) => $e(B))) return;
-    const M = H.flatMap((B) => Ke(e, B.cloneRange()));
+    const P = k.map((B) => qe(B, e));
+    if (P.every((B) => $e(B))) return;
+    const M = P.flatMap((B) => Ke(e, B.cloneRange()));
     if (!(M.length > 0 && !g || M.length !== g.selector.length || M.some((B, V) => B.toString() !== g.selector[V]?.quote))) return;
     const j = a(b) && x ? Xe([
       ...x.selector.map((B) => B.range),
@@ -797,27 +797,27 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
   }, v = async (p) => {
     if (!R) return;
     const T = J(p), k = () => {
-      const { x: H, y: M } = e.getBoundingClientRect();
+      const { x: P, y: M } = e.getBoundingClientRect();
       if (W(e, T.target)) {
         (typeof u == "function" ? u(T, e) : u === "ALWAYS") && o.clear();
         return;
       }
-      const D = T.target instanceof Node && e.contains(T.target) && s.getAt(
-        T.clientX - H,
+      const H = T.target instanceof Node && e.contains(T.target) && s.getAt(
+        T.clientX - P,
         T.clientY - M,
         f === "all",
         d
       );
-      if (D) {
-        const { selected: j } = o, B = new Set(j.map((Y) => Y.id)), V = Array.isArray(D) ? D.map((Y) => Y.id) : [D.id];
-        (B.size !== V.length || !V.every((Y) => B.has(Y))) && (n.emit("clickAnnotation", D), o.userSelect(V, T));
+      if (H) {
+        const { selected: j } = o, B = new Set(j.map((Y) => Y.id)), V = Array.isArray(H) ? H.map((Y) => Y.id) : [H.id];
+        (B.size !== V.length || !V.every((Y) => B.has(Y))) && (n.emit("clickAnnotation", H), o.userSelect(V, T));
       } else
         o.clear();
     };
     if (T.timeStamp - b.timeStamp < ce) {
       await N();
-      const H = document.getSelection(), M = W(e, b.target), D = W(e, T.target);
-      if (H?.isCollapsed || M && D) {
+      const P = document.getSelection(), M = W(e, b.target), H = W(e, T.target);
+      if (P?.isCollapsed || M && H) {
         g = void 0, k();
         return;
       }
@@ -826,11 +826,11 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
   }, N = async () => {
     const p = document.getSelection();
     let T = !1, k = p?.isCollapsed;
-    const U = () => k || T, H = 1;
-    return setTimeout(() => T = !0, 50), _e(() => k = p?.isCollapsed, H, U);
+    const U = () => k || T, P = 1;
+    return setTimeout(() => T = !0, 50), _e(() => k = p?.isCollapsed, P, U);
   }, O = (p) => {
     document.getSelection()?.isCollapsed || ((!g || g.selector.length === 0) && L(p), g && (F(), o.userSelect(g.annotation, J(p))));
-  }, P = (p) => {
+  }, D = (p) => {
     y && (p.repeat || p.target instanceof Node && W(e, p.target) && p.target !== document.body || p.key === "Shift" && g && (document.getSelection().isCollapsed || (F(), o.userSelect(g.annotation, G(p)))));
   }, X = (p) => {
     const T = () => setTimeout(() => {
@@ -864,9 +864,9 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
       (!T || !k || T < k) && s.updateTarget(g);
     }
   };
-  return document.addEventListener("pointerdown", A), document.addEventListener("pointerup", v), document.addEventListener("contextmenu", O), document.addEventListener("keyup", P), e.addEventListener("selectstart", C), document.addEventListener("selectionchange", L), {
+  return document.addEventListener("pointerdown", A), document.addEventListener("pointerup", v), document.addEventListener("contextmenu", O), document.addEventListener("keyup", D), e.addEventListener("selectstart", C), document.addEventListener("selectionchange", L), {
     destroy: () => {
-      g = void 0, x = void 0, R = void 0, b = void 0, L.clear(), document.removeEventListener("pointerdown", A), document.removeEventListener("pointerup", v), document.removeEventListener("contextmenu", O), document.removeEventListener("keyup", P), e.removeEventListener("selectstart", C), document.removeEventListener("selectionchange", L), q.unbind();
+      g = void 0, x = void 0, R = void 0, b = void 0, L.clear(), document.removeEventListener("pointerdown", A), document.removeEventListener("pointerup", v), document.removeEventListener("contextmenu", O), document.removeEventListener("keyup", D), e.removeEventListener("selectstart", C), document.removeEventListener("selectionchange", L), q.unbind();
     },
     setFilter: E,
     setUser: m,
@@ -877,8 +877,8 @@ const fe = "not-annotatable", $ = `.${fe}`, W = (e, t) => e.contains(t) ? !!(t i
   ...e,
   annotatingEnabled: e.annotatingEnabled ?? t.annotatingEnabled,
   user: e.user || t.user
-}), le = "SPANS", Ht = (e, t = {}) => {
-  He(e), De(e);
+}), le = "SPANS", Pt = (e, t = {}) => {
+  Pe(e), He(e);
   const n = St(t, {
     annotatingEnabled: !0,
     user: Le()
@@ -935,7 +935,7 @@ export {
   Ut as Origin,
   Kt as UserSelectAction,
   _t as W3CTextFormat,
-  He as cancelSingleClickEvents,
+  Pe as cancelSingleClickEvents,
   G as cloneKeyboardEvent,
   J as clonePointerEvent,
   se as createBaseRenderer,
@@ -946,12 +946,12 @@ export {
   st as createRenderer,
   Ct as createSelectionHandler,
   dt as createSpansRenderer,
-  Ht as createTextAnnotator,
+  Pt as createTextAnnotator,
   bt as createTextAnnotatorState,
   ee as debounce,
   St as fillDefaults,
   it as getBackgroundColor,
-  Pe as getHighlightClientRects,
+  De as getHighlightClientRects,
   We as getQuoteContext,
   oe as getRangeAnnotatableContents,
   Qe as getViewportBounds,
@@ -965,7 +965,7 @@ export {
   Xe as mergeRanges,
   at as paint,
   gt as parseW3CTextAnnotation,
-  De as programmaticallyFocusable,
+  He as programmaticallyFocusable,
   ze as rangeToSelector,
   te as reviveAnnotation,
   he as reviveSelector,