@soomo/text-annotator 4.1.1-staging.0 → 4.1.2-staging.0

package/dist/model/w3c/w3c-text-annotation.d.ts

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

package/dist/rendering/base-renderer.d.ts

@@ -1,31 +1,31 @@
 import { type Unsubscribe } from 'nanoevents';
-import { type Annotation, type AnnotatorState, type Filter, type ViewportState } from '@annotorious/core';
-import type { TextAnnotation } from '../model';
+import { type AnnotatorState, type Filter, type ViewportState } from '@annotorious/core';
+import type { TextAnnotation, TextAnnotationLike } from '../model';
 import type { TextAnnotatorState } from '../state';
 import { type Highlight, type HighlightStyleExpression, type ViewportBounds } from './';
 /**
  * The renderer runtime interface.
  */
-export interface Renderer {
+export interface Renderer<I extends TextAnnotationLike = TextAnnotation> {
     destroy(): void;
     on: <E extends keyof RendererEvents>(event: E, callback: RendererEvents[E]) => Unsubscribe;
     redraw(force?: boolean): void;
-    setStyle(style?: HighlightStyleExpression, id?: string): void;
+    setStyle(style?: HighlightStyleExpression<I>, id?: string): void;
     setFilter(filter?: Filter<any>): void;
     setVisible(visible: boolean): void;
 }
 export interface RendererEvents {
     onRedraw(): void;
 }
-export type RendererFactory<T extends Annotation> = (container: HTMLElement, state: AnnotatorState<T, any>, viewport: ViewportState) => Renderer;
+export type RendererFactory<T extends TextAnnotationLike> = (container: HTMLElement, state: AnnotatorState<T, any>, viewport: ViewportState) => Renderer<T>;
 /**
  * A utility interface. Instead of implementing a Renderer from scratch,
  * implementers can simply implement a painter, and wrap it in the
  * BaseRenderer, which will handle common concerns.
  */
-export interface Painter {
+export interface Painter<I extends TextAnnotationLike = TextAnnotation> {
     destroy(): void;
-    redraw(highlights: Highlight[], bounds: ViewportBounds, style?: HighlightStyleExpression, styleOverrides?: Map<string, HighlightStyleExpression>, force?: boolean): void;
+    redraw(highlights: Highlight[], bounds: ViewportBounds, style?: HighlightStyleExpression<I>, styleOverrides?: Map<string, HighlightStyleExpression<I>>, force?: boolean): void;
     setVisible(visible: boolean): void;
 }
-export declare const createRenderer: <T extends TextAnnotatorState = TextAnnotatorState<TextAnnotation, any>>(painter: Painter, container: HTMLElement, state: T, viewport: ViewportState) => Renderer;
+export declare const createRenderer: <T extends TextAnnotatorState = TextAnnotatorState<TextAnnotation, any>, I extends TextAnnotationLike = TextAnnotation>(painter: Painter<I>, container: HTMLElement, state: T, viewport: ViewportState) => Renderer<I>;

package/dist/rendering/highlight-style.d.ts

@@ -1,5 +1,5 @@
 import type { AnnotationState, Color, DrawingStyle } from '@annotorious/core';
-import type { TextAnnotation } from '../model';
+import type { TextAnnotation, TextAnnotationLike } from '../model';
 import type { Highlight } from './';
 export interface HighlightStyle extends Pick<DrawingStyle, 'fill' | 'fillOpacity'> {
     underlineStyle?: string;
@@ -7,7 +7,7 @@ export interface HighlightStyle extends Pick<DrawingStyle, 'fill' | 'fillOpacity
     underlineOffset?: number;
     underlineThickness?: number;
 }
-export type HighlightStyleExpression = HighlightStyle | (<I extends TextAnnotation = TextAnnotation>(annotation: I, state: AnnotationState, zIndex?: number) => HighlightStyle | undefined);
+export type HighlightStyleExpression<I extends TextAnnotationLike = TextAnnotation> = HighlightStyle | ((annotation: I, state: AnnotationState, zIndex?: number) => HighlightStyle | undefined);
 export declare const DEFAULT_STYLE: HighlightStyle;
 export declare const DEFAULT_SELECTED_STYLE: HighlightStyle;
 export declare const getBackgroundColor: (style?: HighlightStyle) => string;

package/dist/text-annotator-options.d.ts

@@ -24,7 +24,7 @@ export interface TextAnnotatorOptions<I extends TextAnnotationLike = TextAnnotat
     offsetReferenceSelector?: string;
     renderer?: RendererType | RendererFactory<I>;
     selectionMode?: 'shortest' | 'all';
-    style?: HighlightStyleExpression;
+    style?: HighlightStyleExpression<I>;
     user?: User;
     userSelectAction?: UserSelectActionExpression<E>;
 }

package/dist/text-annotator.d.ts

@@ -6,8 +6,8 @@ import { type TextAnnotatorOptions } from './text-annotator-options';
 import './text-annotator.css';
 export interface TextAnnotator<I extends TextAnnotationLike = TextAnnotation, E extends unknown = TextAnnotation> extends Omit<Annotator<I, E>, 'setStyle' | 'state'> {
     element: HTMLElement;
-    renderer: Renderer;
-    setStyle(style?: HighlightStyleExpression, id?: string): void;
+    renderer: Renderer<I>;
+    setStyle(style?: HighlightStyleExpression<I>, id?: string): void;
     scrollIntoView(annotationOrId: I | string, scrollParentOrId?: string | Element): boolean;
     setAnnotatingEnabled(enabled?: boolean): void;
     setAnnotatingMode(mode?: AnnotatingMode): void;

package/dist/text-annotator.es.js

@@ -11,7 +11,7 @@ import { poll as Dt } from "poll";
 const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft = "not-annotatable", $ = `.${ft}`, W = (t, e) => t.contains(e) ? !!(e instanceof HTMLElement ? e.closest($) : e.parentElement?.closest($)) : !0, gt = (t, e) => {
   const o = e.commonAncestorContainer;
   return !W(t, o);
-}, mt = /^\s*$/, Pt = (t) => mt.test(t.toString()), we = (t) => mt.test(t.textContent || ""), Ht = (t) => {
+}, mt = /^\s*$/, Ht = (t) => mt.test(t.toString()), we = (t) => mt.test(t.textContent || ""), Pt = (t) => {
   if (t.length === 0) return [];
   if (t.length === 1) return [t[0]];
   t.sort((s, n) => {
@@ -156,7 +156,7 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
       }
       return E;
     }, {});
-    if (a.outdated ||= "outdated" in l ? l.outdated : void 0, a.migrationPending ||= "migrationPending" in l ? l.migrationPending : void 0, Vt(g))
+    if (Vt(g))
       a.selector.push(
         {
           ...g,
@@ -293,11 +293,11 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
   e.addEventListener("pointermove", h);
   const A = tt((S = !1) => requestAnimationFrame(() => {
     const C = ie(e), { minX: O, minY: B, maxX: V, maxY: z } = C, K = g ? s.getIntersecting(O, B, V, z).filter(({ annotation: y }) => g?.(y)) : s.getIntersecting(O, B, V, z), st = n.selected.map(({ id: y }) => y), f = K.map(({ annotation: y, rects: M }) => {
-      const P = st.includes(y.id), _ = y.id === r.current;
+      const U = st.includes(y.id), _ = y.id === r.current;
       return {
         annotation: y,
         rects: M,
-        state: { selected: P, hovered: _ }
+        state: { selected: U, hovered: _ }
       };
     });
     t.redraw(f, C, l, m, S), setTimeout(() => {
@@ -338,13 +338,13 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
     setFilter: L,
     setVisible: t.setVisible.bind(t)
   };
-}, U = {
+}, P = {
   fill: "rgb(0, 128, 255)",
   fillOpacity: 0.18
 }, ot = {
   fill: "rgb(0, 128, 255)",
   fillOpacity: 0.45
-}, Qt = (t) => t?.fillOpacity !== void 0 ? et(t?.fill || U.fill).alpha(t.fillOpacity).toHex() : t?.fill ? t.fill : et(U.fill).alpha(U.fillOpacity).toHex(), St = (t, e, o) => e ? typeof e == "function" ? e(t.annotation, t.state, o) || (t.state?.selected ? ot : U) : e : t.state?.selected ? ot : U, Zt = (t, e) => {
+}, Qt = (t) => t?.fillOpacity !== void 0 ? et(t?.fill || P.fill).alpha(t.fillOpacity).toHex() : t?.fill ? t.fill : et(P.fill).alpha(P.fillOpacity).toHex(), St = (t, e, o) => e ? typeof e == "function" ? e(t.annotation, t.state, o) || (t.state?.selected ? ot : P) : e : t.state?.selected ? ot : P, Zt = (t, e) => {
   const o = (n, r) => n.x <= r.x + r.width && n.x + n.width >= r.x && n.y <= r.y + r.height && n.y + n.height >= r.y, i = (n) => n.rects.reduce((r, a) => r + a.width, 0), s = e.filter(({ rects: n }) => n.some((r) => o(t, r)));
   return s.sort((n, r) => i(r) - i(n)), s.findIndex((n) => n.rects.includes(t));
 }, Jt = (t) => {
@@ -661,22 +661,23 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
     if (!h) return;
     const y = document.getSelection();
     if (!y?.anchorNode) return;
-    const P = Array.from(Array(y.rangeCount).keys()).map((k) => y.getRangeAt(k)).map((k) => Wt(k, t));
-    if (P.every((k) => !gt(t, k))) {
+    const M = Array.from(Array(y.rangeCount).keys()).map((k) => y.getRangeAt(k));
+    if (M.every((k) => !gt(t, k))) {
       d = void 0;
       return;
     }
-    const _ = f.timeStamp - (v?.timeStamp || f.timeStamp);
-    if (v?.type === "pointerdown" && (_ < 1e3 && !d || y.isCollapsed && _ < at) && T(), !d && (T(), !d))
+    const U = f.timeStamp - (v?.timeStamp || f.timeStamp);
+    if (v?.type === "pointerdown" && (U < 1e3 && !d || y.isCollapsed && U < at) && T(), !d && (T(), !d))
       return;
     if (y.isCollapsed) {
       s.getAnnotation(d.annotation) && !(u(v) || A === "REPLACE_CURRENT") && (n.clear(), s.deleteAnnotation(d.annotation));
       return;
     }
-    if (P.every((k) => Pt(k))) return;
-    const I = P.flatMap((k) => Ft(t, k.cloneRange()));
+    const _ = M.map((k) => Wt(k, t));
+    if (_.every((k) => Ht(k))) return;
+    const I = _.flatMap((k) => Ft(t, k.cloneRange()));
     if (!(I.length > 0 && !d || I.length !== d.selector.length || I.some((k, Y) => k.toString() !== d?.selector[Y]?.quote))) return;
-    const j = u(v) && L ? Ht([
+    const j = u(v) && L ? Pt([
       ...L.selector.map((k) => k.range),
       ...I
     ]) : I;
@@ -719,8 +720,8 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
   }, C = async () => {
     const f = document.getSelection();
     let y = !1, M = f?.isCollapsed;
-    const P = () => M || y, _ = 1;
-    return setTimeout(() => y = !0, 50), Dt(() => M = f?.isCollapsed, _, P);
+    const U = () => M || y, _ = 1;
+    return setTimeout(() => y = !0, 50), Dt(() => M = f?.isCollapsed, _, U);
   }, O = (f) => {
     document.getSelection()?.isCollapsed || ((!d || d.selector.length === 0) && R(f), d && (K(), n.userSelect(d.annotation, J(f))));
   }, B = (f) => {
@@ -771,7 +772,7 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
     setAnnotatingMode: b
   };
 }, fe = (t) => [
-  `background-color:${et(t?.fill || U.fill).alpha(t?.fillOpacity === void 0 ? U.fillOpacity : t.fillOpacity).toHex()}`,
+  `background-color:${et(t?.fill || P.fill).alpha(t?.fillOpacity === void 0 ? P.fillOpacity : t.fillOpacity).toHex()}`,
   t?.underlineThickness ? "text-decoration:underline" : void 0,
   t?.underlineColor ? `text-decoration-color:${t.underlineColor}` : void 0,
   t?.underlineOffset ? `text-underline-offset:${t.underlineOffset}px` : void 0,
@@ -873,7 +874,7 @@ const ut = typeof navigator < "u" && navigator.platform.startsWith("Mac"), ft =
 };
 export {
   ot as DEFAULT_SELECTED_STYLE,
-  U as DEFAULT_STYLE,
+  P as DEFAULT_STYLE,
   ft as NOT_ANNOTATABLE_CLASS,
   $ as NOT_ANNOTATABLE_SELECTOR,
   Be as Origin,
@@ -901,10 +902,10 @@ export {
   we as isNodeWhitespaceOrEmpty,
   W as isNotAnnotatable,
   gt as isRangeAnnotatable,
-  Pt as isRangeWhitespaceOrEmpty,
+  Ht as isRangeWhitespaceOrEmpty,
   D as isRevived,
   ne as mergeClientRects,
-  Ht as mergeRanges,
+  Pt as mergeRanges,
   jt as parseW3CTextAnnotation,
   Ut as programmaticallyFocusable,
   Yt as rangeToSelector,