@embedpdf/plugin-annotation 3.0.0-next.1 → 3.0.0-next.11

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-import { C as PromptSourceSpec, D as ToolAuthoringKind, E as StampSourceSpec, O as ToolDefaultsFor, S as InkAuthoringOptions, T as SelectionAuthoring, _ as ToolGhost, a as AnnotationState, b as DEFAULT_TOOLS, c as ChromeSettings, d as FilePromptRequest, f as LinkNavItem, g as TextItem, h as StampToolInput, i as AnnotationHostCapability, l as ChromeSettingsPatch, m as SelectionProps, n as AnnotationCapability, p as SelectionFlags, r as AnnotationConfig, s as Behavior, t as AnnotationAction, u as FilePickerProvider, v as AnnotationToolDef, w as ResolvedTool, x as GhostPolicy, y as AnnotationToolInput } from "./types-BhWgqgbX.cjs";
-import { CapabilityToken } from "@embedpdf/core";
-import { AnnotationDTO, AnnotationDraft, AnnotationPatch, AnnotationRef, PdfLinkTarget, PdfRect, WidgetAppearance } from "@embedpdf/engine-core/runtime";
-import { Annot, AnnotationFlags, AnnotationProps, AnnotationPropsPatch, AnnotationPropsPatch as AnnotationPropsPatch$1, BlendMode, Border, ClickCreate, ClickPlacement, Geom, LineEnding, LineEndings, MIN_DRAG, PropKey, PropKey as PropKey$1, PropSpec, Rect, SnapSettings, Style, TextAlign, propsFor, resolveClickPlacement } from "@embedpdf/core-annotation";
+import { a as toCreateDraft, c as styleFromDTO, i as fromDTO, l as widgetAppearanceFromProps, o as toPatch, s as refKey } from "./authoring-BhtyfsMx.cjs";
+import { A as StampSourceSpec, C as AnnotationToolInput, D as PromptSourceSpec, E as InkAuthoringOptions, M as ToolDefaultsFor, O as ResolvedTool, S as AnnotationToolDef, T as GhostPolicy, _ as SelectionProps, a as AnnotationHydration, b as ThreadDeleteResult, c as Behavior, d as CommentPermissions, f as CommentsApi, g as SelectionFlags, h as LinkNavItem, i as AnnotationHostCapability, j as ToolAuthoringKind, k as SelectionAuthoring, l as ChromeSettings, m as FilePromptRequest, n as AnnotationCapability, o as AnnotationState, p as FilePickerProvider, r as AnnotationConfig, t as AnnotationAction, u as ChromeSettingsPatch, v as StampToolInput, w as DEFAULT_TOOLS, x as ToolGhost, y as TextItem } from "./types-eLTpocXz.cjs";
+import { AnnotationDTO, AnnotationFlags, AnnotationProps, AnnotationPropsPatch, AnnotationRef, AnnotationSubtype, AnnotationToken, BlendMode, Border, ClickCreate, Color, CommentThread, CommentThreadReview, LineEnding, LineEndings, PropKey, PropSpec, ReviewStatus, SnapSettings, TextAlign } from "./contract.cjs";
+import { ClickPlacement, MIN_DRAG, propsFor, resolveClickPlacement } from "@embedpdf/core-annotation";
 //#region src/annotation.plugin.d.ts
 /**
  * The annotation plugin. Document-scoped; requires the interaction hub and
@@ -10,39 +10,6 @@ import { Annot, AnnotationFlags, AnnotationProps, AnnotationPropsPatch, Annotati
  */
 declare const annotationPlugin: (config?: AnnotationConfig) => import("@embedpdf/core").PluginDef<AnnotationState, AnnotationAction, AnnotationHostCapability>;
 //#endregion
-//#region src/repository/seam.d.ts
-declare function refKey(ref: AnnotationRef): string;
-/** Engine DTO → content-space `Style` (CSS colours, `Border` union). Exported so
- *  selection-aware UIs can read display values straight off a {@link AnnotationDTO}
- *  without re-deriving the colour/border mapping. */
-declare function styleFromDTO(dto: AnnotationDTO): Style;
-/**
- * The flat props vocabulary (CSS colours, house keys) → the engine's widget
- * appearance for `doc.forms` authoring — the SAME mapping the widget patch
- * lowering uses, exported as a boundary utility so the form plugin can style
- * `placeField` from a tool's `currentDefaults` without growing a second CSS
- * parser. Absent keys stay absent (the engine writes nothing for them).
- */
-declare function widgetAppearanceFromProps(props: AnnotationPropsPatch$1): WidgetAppearance;
-//#endregion
-//#region src/repository/index.d.ts
-/**
- * Engine DTO → content-space Annot. `source` decides how it renders: `'baked'`
- * shows the engine's appearance raster (a page load, or a remote edit — trust
- * the authored AP); `'vector'` renders live from geom/style (we authored or
- * changed it). `apBox` is the raster's content-space box, used while baked.
- */
-declare function fromDTO(dto: AnnotationDTO, crop: PdfRect, source?: 'baked' | 'vector'): Annot;
-/** Content Annot → the FULL engine patch: the kind's geometry group plus every
- *  prop it declares editable. The reference statement — scoped emission and
- *  drafts both build on it. */
-declare function toPatch(a: Annot, crop: PdfRect): AnnotationPatch | null;
-/** Content Annot → engine create draft: the full statement plus the kind's
- *  create-only extras, with the model's `/F` emitted verbatim, once, for every
- *  kind (a fresh draw carries DRAWN_FLAGS plus any tool seed). `null` for the
- *  kinds whose creates travel their own path (stamps, widgets, icon place). */
-declare function toCreateDraft(a: Annot, crop: PdfRect): AnnotationDraft | null;
-//#endregion
 //#region src/reducer.d.ts
 /**
  * Out-of-the-box selection chrome — a sensible document-annotation feel. Every
@@ -52,14 +19,5 @@ declare function toCreateDraft(a: Annot, crop: PdfRect): AnnotationDraft | null;
  */
 declare const DEFAULT_CHROME: ChromeSettings;
 //#endregion
-//#region src/index.d.ts
-/**
- * App-facing annotation token: resolves the public {@link AnnotationCapability}.
- * It is the SAME runtime token the plugin provides, narrowed to the public lens —
- * the framework-only surface (render projection, pointer gestures, behavior
- * registration) is reachable only via `@embedpdf/plugin-annotation/internal`.
- */
-declare const AnnotationToken: CapabilityToken<AnnotationCapability>;
-//#endregion
-export { type AnnotationAction, type AnnotationCapability, type AnnotationConfig, type AnnotationFlags, type AnnotationProps, type AnnotationPropsPatch, type AnnotationState, AnnotationToken, type AnnotationToolDef, type AnnotationToolInput, type Behavior, type BlendMode, type Border, type ChromeSettings, type ChromeSettingsPatch, type ClickCreate, type ClickPlacement, DEFAULT_CHROME, DEFAULT_TOOLS, type FilePickerProvider, type FilePromptRequest, type GhostPolicy, type InkAuthoringOptions, type LineEnding, type LineEndings, type LinkNavItem, MIN_DRAG, type PromptSourceSpec, type PropKey, type PropSpec, type ResolvedTool, type SelectionAuthoring, type SelectionFlags, type SelectionProps, type SnapSettings, type StampSourceSpec, type StampToolInput, type TextAlign, type TextItem, type ToolAuthoringKind, type ToolDefaultsFor, type ToolGhost, annotationPlugin, fromDTO, propsFor, refKey, resolveClickPlacement, styleFromDTO, toCreateDraft, toPatch, widgetAppearanceFromProps };
+export { type AnnotationAction, type AnnotationCapability, type AnnotationConfig, type AnnotationDTO, type AnnotationFlags, type AnnotationHydration, type AnnotationProps, type AnnotationPropsPatch, type AnnotationRef, type AnnotationState, type AnnotationSubtype, AnnotationToken, type AnnotationToolDef, type AnnotationToolInput, type Behavior, type BlendMode, type Border, type ChromeSettings, type ChromeSettingsPatch, type ClickCreate, type ClickPlacement, type Color, type CommentPermissions, type CommentThread, type CommentThreadReview, type CommentsApi, DEFAULT_CHROME, DEFAULT_TOOLS, type FilePickerProvider, type FilePromptRequest, type GhostPolicy, type InkAuthoringOptions, type LineEnding, type LineEndings, type LinkNavItem, MIN_DRAG, type PromptSourceSpec, type PropKey, type PropSpec, type ResolvedTool, type ReviewStatus, type SelectionAuthoring, type SelectionFlags, type SelectionProps, type SnapSettings, type StampSourceSpec, type StampToolInput, type TextAlign, type TextItem, type ThreadDeleteResult, type ToolAuthoringKind, type ToolDefaultsFor, type ToolGhost, annotationPlugin, fromDTO, propsFor, refKey, resolveClickPlacement, styleFromDTO, toCreateDraft, toPatch, widgetAppearanceFromProps };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { C as PromptSourceSpec, D as ToolAuthoringKind, E as StampSourceSpec, O as ToolDefaultsFor, S as InkAuthoringOptions, T as SelectionAuthoring, _ as ToolGhost, a as AnnotationState, b as DEFAULT_TOOLS, c as ChromeSettings, d as FilePromptRequest, f as LinkNavItem, g as TextItem, h as StampToolInput, i as AnnotationHostCapability, l as ChromeSettingsPatch, m as SelectionProps, n as AnnotationCapability, p as SelectionFlags, r as AnnotationConfig, s as Behavior, t as AnnotationAction, u as FilePickerProvider, v as AnnotationToolDef, w as ResolvedTool, x as GhostPolicy, y as AnnotationToolInput } from "./types-Da6JRmhw.js";
-import { CapabilityToken } from "@embedpdf/core";
-import { AnnotationDTO, AnnotationDraft, AnnotationPatch, AnnotationRef, PdfLinkTarget, PdfRect, WidgetAppearance } from "@embedpdf/engine-core/runtime";
-import { Annot, AnnotationFlags, AnnotationProps, AnnotationPropsPatch, AnnotationPropsPatch as AnnotationPropsPatch$1, BlendMode, Border, ClickCreate, ClickPlacement, Geom, LineEnding, LineEndings, MIN_DRAG, PropKey, PropKey as PropKey$1, PropSpec, Rect, SnapSettings, Style, TextAlign, propsFor, resolveClickPlacement } from "@embedpdf/core-annotation";
+import { a as toCreateDraft, c as styleFromDTO, i as fromDTO, l as widgetAppearanceFromProps, o as toPatch, s as refKey } from "./authoring-R4ezdnXd.js";
+import { A as StampSourceSpec, C as AnnotationToolInput, D as PromptSourceSpec, E as InkAuthoringOptions, M as ToolDefaultsFor, O as ResolvedTool, S as AnnotationToolDef, T as GhostPolicy, _ as SelectionProps, a as AnnotationHydration, b as ThreadDeleteResult, c as Behavior, d as CommentPermissions, f as CommentsApi, g as SelectionFlags, h as LinkNavItem, i as AnnotationHostCapability, j as ToolAuthoringKind, k as SelectionAuthoring, l as ChromeSettings, m as FilePromptRequest, n as AnnotationCapability, o as AnnotationState, p as FilePickerProvider, r as AnnotationConfig, t as AnnotationAction, u as ChromeSettingsPatch, v as StampToolInput, w as DEFAULT_TOOLS, x as ToolGhost, y as TextItem } from "./types-otwv-Cdl.js";
+import { AnnotationDTO, AnnotationFlags, AnnotationProps, AnnotationPropsPatch, AnnotationRef, AnnotationSubtype, AnnotationToken, BlendMode, Border, ClickCreate, Color, CommentThread, CommentThreadReview, LineEnding, LineEndings, PropKey, PropSpec, ReviewStatus, SnapSettings, TextAlign } from "./contract.js";
+import { ClickPlacement, MIN_DRAG, propsFor, resolveClickPlacement } from "@embedpdf/core-annotation";
 //#region src/annotation.plugin.d.ts
 /**
  * The annotation plugin. Document-scoped; requires the interaction hub and
@@ -10,39 +10,6 @@ import { Annot, AnnotationFlags, AnnotationProps, AnnotationPropsPatch, Annotati
  */
 declare const annotationPlugin: (config?: AnnotationConfig) => import("@embedpdf/core").PluginDef<AnnotationState, AnnotationAction, AnnotationHostCapability>;
 //#endregion
-//#region src/repository/seam.d.ts
-declare function refKey(ref: AnnotationRef): string;
-/** Engine DTO → content-space `Style` (CSS colours, `Border` union). Exported so
- *  selection-aware UIs can read display values straight off a {@link AnnotationDTO}
- *  without re-deriving the colour/border mapping. */
-declare function styleFromDTO(dto: AnnotationDTO): Style;
-/**
- * The flat props vocabulary (CSS colours, house keys) → the engine's widget
- * appearance for `doc.forms` authoring — the SAME mapping the widget patch
- * lowering uses, exported as a boundary utility so the form plugin can style
- * `placeField` from a tool's `currentDefaults` without growing a second CSS
- * parser. Absent keys stay absent (the engine writes nothing for them).
- */
-declare function widgetAppearanceFromProps(props: AnnotationPropsPatch$1): WidgetAppearance;
-//#endregion
-//#region src/repository/index.d.ts
-/**
- * Engine DTO → content-space Annot. `source` decides how it renders: `'baked'`
- * shows the engine's appearance raster (a page load, or a remote edit — trust
- * the authored AP); `'vector'` renders live from geom/style (we authored or
- * changed it). `apBox` is the raster's content-space box, used while baked.
- */
-declare function fromDTO(dto: AnnotationDTO, crop: PdfRect, source?: 'baked' | 'vector'): Annot;
-/** Content Annot → the FULL engine patch: the kind's geometry group plus every
- *  prop it declares editable. The reference statement — scoped emission and
- *  drafts both build on it. */
-declare function toPatch(a: Annot, crop: PdfRect): AnnotationPatch | null;
-/** Content Annot → engine create draft: the full statement plus the kind's
- *  create-only extras, with the model's `/F` emitted verbatim, once, for every
- *  kind (a fresh draw carries DRAWN_FLAGS plus any tool seed). `null` for the
- *  kinds whose creates travel their own path (stamps, widgets, icon place). */
-declare function toCreateDraft(a: Annot, crop: PdfRect): AnnotationDraft | null;
-//#endregion
 //#region src/reducer.d.ts
 /**
  * Out-of-the-box selection chrome — a sensible document-annotation feel. Every
@@ -52,14 +19,5 @@ declare function toCreateDraft(a: Annot, crop: PdfRect): AnnotationDraft | null;
  */
 declare const DEFAULT_CHROME: ChromeSettings;
 //#endregion
-//#region src/index.d.ts
-/**
- * App-facing annotation token: resolves the public {@link AnnotationCapability}.
- * It is the SAME runtime token the plugin provides, narrowed to the public lens —
- * the framework-only surface (render projection, pointer gestures, behavior
- * registration) is reachable only via `@embedpdf/plugin-annotation/internal`.
- */
-declare const AnnotationToken: CapabilityToken<AnnotationCapability>;
-//#endregion
-export { type AnnotationAction, type AnnotationCapability, type AnnotationConfig, type AnnotationFlags, type AnnotationProps, type AnnotationPropsPatch, type AnnotationState, AnnotationToken, type AnnotationToolDef, type AnnotationToolInput, type Behavior, type BlendMode, type Border, type ChromeSettings, type ChromeSettingsPatch, type ClickCreate, type ClickPlacement, DEFAULT_CHROME, DEFAULT_TOOLS, type FilePickerProvider, type FilePromptRequest, type GhostPolicy, type InkAuthoringOptions, type LineEnding, type LineEndings, type LinkNavItem, MIN_DRAG, type PromptSourceSpec, type PropKey, type PropSpec, type ResolvedTool, type SelectionAuthoring, type SelectionFlags, type SelectionProps, type SnapSettings, type StampSourceSpec, type StampToolInput, type TextAlign, type TextItem, type ToolAuthoringKind, type ToolDefaultsFor, type ToolGhost, annotationPlugin, fromDTO, propsFor, refKey, resolveClickPlacement, styleFromDTO, toCreateDraft, toPatch, widgetAppearanceFromProps };
+export { type AnnotationAction, type AnnotationCapability, type AnnotationConfig, type AnnotationDTO, type AnnotationFlags, type AnnotationHydration, type AnnotationProps, type AnnotationPropsPatch, type AnnotationRef, type AnnotationState, type AnnotationSubtype, AnnotationToken, type AnnotationToolDef, type AnnotationToolInput, type Behavior, type BlendMode, type Border, type ChromeSettings, type ChromeSettingsPatch, type ClickCreate, type ClickPlacement, type Color, type CommentPermissions, type CommentThread, type CommentThreadReview, type CommentsApi, DEFAULT_CHROME, DEFAULT_TOOLS, type FilePickerProvider, type FilePromptRequest, type GhostPolicy, type InkAuthoringOptions, type LineEnding, type LineEndings, type LinkNavItem, MIN_DRAG, type PromptSourceSpec, type PropKey, type PropSpec, type ResolvedTool, type ReviewStatus, type SelectionAuthoring, type SelectionFlags, type SelectionProps, type SnapSettings, type StampSourceSpec, type StampToolInput, type TextAlign, type TextItem, type ThreadDeleteResult, type ToolAuthoringKind, type ToolDefaultsFor, type ToolGhost, annotationPlugin, fromDTO, propsFor, refKey, resolveClickPlacement, styleFromDTO, toCreateDraft, toPatch, widgetAppearanceFromProps };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,14 +1,20 @@
-import { a as toCreateDraft, c as styleFromDTO, i as fromDTO, l as widgetAppearanceFromProps, n as DEFAULT_TOOLS, o as toPatch, s as refKey, t as createAnnotationCapability, u as AnnotationToken$1 } from "./capability-fghl0JmE.js";
+import { d as refKey, h as widgetAppearanceFromProps, p as styleFromDTO } from "./seam-C4L_7rDt.js";
+import { a as fromDTO, i as isTouchDirect, n as DEFAULT_TOOLS, o as toCreateDraft, s as toPatch, t as createAnnotationCapability } from "./capability-DBsr2D-L.js";
+import { t as AnnotationToken$1 } from "./types-CwytT-TI.js";
+import { AnnotationToken } from "./contract.js";
+import "./authoring.js";
 import { definePlugin } from "@embedpdf/core";
-import { InteractionToken } from "@embedpdf/plugin-interaction";
-import { SelectionToken } from "@embedpdf/plugin-selection";
+import { ActionsToken } from "@embedpdf/plugin-actions/contract";
+import { ActionsToken as ActionsToken$1 } from "@embedpdf/plugin-actions/contract/host";
+import { InteractionToken } from "@embedpdf/plugin-interaction/contract";
+import { SelectionToken } from "@embedpdf/plugin-selection/contract/host";
 import { encodeStableIdKey } from "@embedpdf/engine-core/runtime";
-import { MIN_DRAG, initialModel, propsFor, propsFor as propsFor$1, resolveClickPlacement, update } from "@embedpdf/core-annotation";
+import { MIN_DRAG, initialModel, propsFor, resolveClickPlacement, update } from "@embedpdf/core-annotation";
 //#region src/effects.ts
 function registerAnnotationEffects(ctx) {
 	const doc = ctx.doc;
 	if (!doc) return;
-	const cropOf = (pon) => ctx.document()?.pages.find((p) => p.pageObjectNumber === pon)?.boxes.crop ?? null;
+	const host = () => ctx.get(AnnotationToken$1);
 	const apply = (msg) => {
 		const [next] = update(ctx.getState().model, msg);
 		ctx.dispatch({
@@ -16,39 +22,6 @@ function registerAnnotationEffects(ctx) {
 			model: next
 		});
 	};
-	const upsert = (dtos, bumpAp) => {
-		const bump = [];
-		const keep = [];
-		for (const dto of dtos) {
-			const crop = cropOf(dto.pageObjectNumber);
-			if (!crop) continue;
-			const a = fromDTO(dto, crop, "baked");
-			if (a.subtype === "link" && a.data?.subtype === "link" && a.data.replyType === "group") {
-				const parentId = a.data.inReplyTo ? refKey(a.data.inReplyTo) : null;
-				const parent = parentId ? ctx.getState().model.byId[parentId] : null;
-				if (parent && parent.subtype !== "link" && propsFor$1(parent.subtype).some((s) => s.key === "link") && a.ref) {
-					const refs = parent.linkRefs ?? [];
-					const known = refs.some((r) => refKey(r) === a.id);
-					keep.push({
-						...parent,
-						link: a.data.target,
-						linkRefs: known ? refs : [...refs, a.ref]
-					});
-					continue;
-				}
-			}
-			(bumpAp ? bump : keep).push(a);
-		}
-		if (bump.length) apply({
-			t: "upsert",
-			annots: bump,
-			bumpAp: true
-		});
-		if (keep.length) apply({
-			t: "upsert",
-			annots: keep
-		});
-	};
 	const unsubscribe = doc.events.subscribe((event) => {
 		if (event.type === "form.valueChanged" || event.type === "form.effectsApplied") {
 			apply({
@@ -62,52 +35,43 @@ function registerAnnotationEffects(ctx) {
 		}
 		if (event.type === "redaction.applied") {
 			const affected = new Set(event.results.filter((r) => r.status === "applied").map((r) => r.pageObjectNumber));
-			if (affected.size) {
-				const host = ctx.get(AnnotationToken$1);
-				for (const pon of affected) host.reloadPage(pon);
-			}
+			if (affected.size) for (const pon of affected) host().reloadPage(pon);
+			return;
+		}
+		if (event.type === "stream.desynced") {
+			host().rehydrate();
+			return;
+		}
+		if (event.type === "pages.deleted") {
+			const gone = new Set(event.pageObjectNumbers);
+			const m = ctx.getState().model;
+			const ids = m.order.filter((id) => {
+				const a = m.byId[id];
+				return a !== void 0 && gone.has(a.pon);
+			});
+			if (ids.length) apply({
+				t: "remove",
+				ids
+			});
+			return;
+		}
+		if (event.type === "pages.inserted") {
+			for (const pon of event.insertedPageObjectNumbers) host().reloadPage(pon);
 			return;
 		}
 		if (!("origin" in event) || event.origin.kind !== "remote") return;
 		switch (event.type) {
 			case "annotation.created":
-				upsert([event.created], true);
-				break;
 			case "annotation.updated":
-				upsert([event.updated], event.appearance.changed);
-				break;
 			case "annotation.moved":
-				upsert(event.moved, false);
-				break;
 			case "annotation.deleted":
-				if (event.deleted) {
-					const key = encodeStableIdKey(event.deleted);
-					const m = ctx.getState().model;
-					if (m.byId[key]) apply({
-						t: "remove",
-						ids: [key]
-					});
-					else for (const id of m.order) {
-						const a = m.byId[id];
-						const refs = a?.linkRefs;
-						if (!a || !refs?.length || !refs.some((r) => refKey(r) === key)) continue;
-						const remaining = refs.filter((r) => refKey(r) !== key);
-						apply({
-							t: "upsert",
-							annots: [{
-								...a,
-								linkRefs: remaining,
-								...remaining.length ? {} : { link: null }
-							}]
-						});
-						break;
-					}
-				}
+				host().deliverRemoteAnnotationEvent(event);
 				break;
 			default: break;
 		}
 	});
 	ctx.cleanup(unsubscribe);
+	host().ensureHydrated();
 }
 //#endregion
 //#region src/handler.ts
@@ -183,22 +147,25 @@ function createEditHandler(anno, interaction) {
 		id: "annotation-edit",
 		priority: 100,
 		enabledFor: (t) => t.enables.has("annotation-edit"),
+		claimsTouch: (s) => !!s.page && anno.claimsTouchAt(s.page.pon, s.page.point, s.page.scale, s.page.rotation, s.page.zoom),
 		onDown: (s) => {
 			if (!s.page) return false;
+			const touch = s.pointerType === "touch";
 			const wasEditing = anno.currentEditing() != null;
 			if (wasEditing) anno.endTextEdit();
-			if (anno.hitKind(s.page.pon, s.page.point, s.page.scale, s.page.rotation, s.page.zoom) === "empty") {
+			if (anno.hitKind(s.page.pon, s.page.point, s.page.scale, s.page.rotation, s.page.zoom, touch) === "empty") {
 				if (!s.modifiers.shift) anno.deselect();
 				return wasEditing;
 			}
 			if ((s.clickCount ?? 1) >= 2) {
-				anno.beginTextEditAt(s.page.pon, s.page.point, s.page.scale, s.page.rotation, s.page.zoom);
-				return true;
+				if (anno.beginTextEditAt(s.page.pon, s.page.point, s.page.scale, s.page.rotation, s.page.zoom)) return true;
 			}
-			anno.editPointer("down", s.page.pon, s.page.point, s.modifiers.shift, s.page.scale, s.page.rotation, s.page.zoom);
+			anno.editPointer("down", s.page.pon, s.page.point, s.modifiers.shift, s.page.scale, s.page.rotation, s.page.zoom, touch);
 			origin = {
 				pon: s.page.pon,
-				point: s.page.point
+				point: s.page.point,
+				downPoint: s.page.point,
+				touch
 			};
 			return true;
 		},
@@ -207,13 +174,20 @@ function createEditHandler(anno, interaction) {
 			const point = pointOn(s, origin.pon);
 			if (!point) return;
 			origin.point = point;
-			anno.editPointer("move", origin.pon, point, s.modifiers.shift, s.page?.scale, s.page?.rotation, s.page?.zoom);
+			anno.editPointer("move", origin.pon, point, s.modifiers.shift, s.page?.scale, s.page?.rotation, s.page?.zoom, origin.touch);
 		},
 		onUp: (s) => {
 			if (!origin) return;
-			anno.editPointer("up", origin.pon, pointOn(s, origin.pon) ?? origin.point, false);
+			anno.editPointer("up", origin.pon, pointOn(s, origin.pon) ?? origin.point, false, void 0, void 0, void 0, origin.touch);
 			origin = null;
 		},
+		onCancel: () => {
+			if (!origin) return;
+			const { pon, downPoint, touch } = origin;
+			origin = null;
+			anno.editPointer("move", pon, downPoint, false, void 0, void 0, void 0, touch);
+			anno.editPointer("up", pon, downPoint, false, void 0, void 0, void 0, touch);
+		},
 		onHover: (s) => {
 			interaction.setCursor("annotation", s.page ? anno.cursorAt(s.page.pon, s.page.point, s.page.scale, s.page.rotation, s.page.zoom) : null, 20);
 			anno.hoverAt(s.page ? {
@@ -280,6 +254,12 @@ function createMarqueeHandler(anno) {
 			anchor = null;
 			last = null;
 			dragging = false;
+		},
+		onCancel: () => {
+			anchor = null;
+			last = null;
+			dragging = false;
+			anno.cancelCreationDraft();
 		}
 	};
 }
@@ -358,6 +338,16 @@ function createDrawHandler(anno, interaction) {
 			}
 			origin = null;
 		},
+		onCancel: () => {
+			if (pendingInk) {
+				clearTimeout(pendingInk.timer);
+				pendingInk = null;
+			}
+			drawingPoly = false;
+			drawingCallout = false;
+			origin = null;
+			anno.cancelCreationDraft();
+		},
 		onHover: (s) => {
 			const tool = toolId();
 			const st = subtypeOf(tool);
@@ -381,9 +371,9 @@ function wireMarkup(annotation, selection, interaction) {
 		const previewSubtype = authoring?.kind === "markup" ? tool.subtype : authoring?.kind === "text-edit" && authoring.operation === "replace" ? "strikeout" : null;
 		selection.setHighlightVisible(previewSubtype == null);
 		if (previewSubtype && tool && selection.hasSelection()) {
-			const rectsByPage = {};
-			for (const page of selection.snapshot().pages) rectsByPage[page.pon] = page.rects;
-			annotation.previewMarkup(previewSubtype, rectsByPage, tool.preset);
+			const quadsByPage = {};
+			for (const page of selection.snapshot().pages) quadsByPage[page.pon] = page.segments.map((s) => s.quad);
+			annotation.previewMarkup(previewSubtype, quadsByPage, tool.preset);
 		} else annotation.clearMarkupPreview();
 	};
 	selection.onChange(sync);
@@ -394,19 +384,30 @@ function wireMarkup(annotation, selection, interaction) {
 		if (!tool || !authoring) return;
 		const snapshot = selection.snapshot();
 		if (authoring.kind === "text-edit" && authoring.operation === "insert") {
-			if (snapshot.end) annotation.createCaret(snapshot.end.pon, snapshot.end.rect);
+			if (snapshot.end) annotation.createCaret(snapshot.end.pon, {
+				glyphQuad: snapshot.end.glyphQuad,
+				advance: snapshot.end.advance
+			});
 			selection.clear();
 			return;
 		}
 		if (authoring.kind === "text-edit" && authoring.operation === "replace") {
 			for (const page of snapshot.pages) {
-				const endRect = page.rects[page.rects.length - 1];
-				if (endRect) annotation.createReplaceText(page.pon, page.rects, endRect, tool.preset);
+				const last = page.segments[page.segments.length - 1];
+				if (!last) continue;
+				const anchor = snapshot.end && snapshot.end.pon === page.pon ? {
+					glyphQuad: snapshot.end.glyphQuad,
+					advance: snapshot.end.advance
+				} : {
+					glyphQuad: last.quad,
+					advance: last.advance
+				};
+				annotation.createReplaceText(page.pon, page.segments.map((s) => s.quad), anchor, tool.preset);
 			}
 			selection.clear();
 			return;
 		}
-		for (const page of snapshot.pages) annotation.createMarkup(tool.subtype, page.pon, page.rects, tool.preset);
+		for (const page of snapshot.pages) annotation.createMarkup(tool.subtype, page.pon, page.segments.map((s) => s.quad), tool.preset);
 		selection.clear();
 	});
 }
@@ -480,6 +481,7 @@ const initialAnnotationState = (config = {}) => ({
 			...config.snap
 		}
 	},
+	hydration: { status: "loading" },
 	chrome: mergeChrome(DEFAULT_CHROME, config.chrome ?? {}),
 	toolGhost: null,
 	stampArmEpoch: 0
@@ -490,6 +492,10 @@ const annotationReducer = (state, action) => {
 			...state,
 			model: action.model
 		};
+		case "SET_HYDRATION": return {
+			...state,
+			hydration: action.hydration
+		};
 		case "SET_CHROME": return {
 			...state,
 			chrome: mergeChrome(state.chrome, action.patch)
@@ -518,7 +524,7 @@ const annotationPlugin = (config = {}) => definePlugin({
 	token: AnnotationToken$1,
 	scope: "document",
 	requires: [InteractionToken],
-	optional: [SelectionToken],
+	optional: [SelectionToken, ActionsToken],
 	initialState: () => initialAnnotationState(config),
 	reduce: annotationReducer,
 	capability: (ctx) => createAnnotationCapability(ctx, config),
@@ -527,12 +533,15 @@ const annotationPlugin = (config = {}) => definePlugin({
 		const interaction = ctx.get(InteractionToken);
 		const annotation = ctx.get(AnnotationToken$1);
 		const selection = ctx.tryGet(SelectionToken);
+		const actions = ctx.tryGet(ActionsToken$1);
+		if (actions) ctx.cleanup(actions.registerAnnotCommitSink((entries) => annotation.commitScriptEffects(entries)));
 		for (const tool of annotation.tools()) {
 			if (tool.enables.has("text-select") && !selection) continue;
 			interaction.registerTool({
 				id: tool.id,
 				cursor: tool.cursor,
-				enables: tool.enables
+				enables: tool.enables,
+				touchDirect: isTouchDirect(tool.enables)
 			});
 			if (tool.defaults) annotation.setDefaults(tool.preset, tool.defaults);
 		}
@@ -551,15 +560,6 @@ const annotationPlugin = (config = {}) => definePlugin({
 	}
 });
 //#endregion
-//#region src/index.ts
-/**
-* App-facing annotation token: resolves the public {@link AnnotationCapability}.
-* It is the SAME runtime token the plugin provides, narrowed to the public lens —
-* the framework-only surface (render projection, pointer gestures, behavior
-* registration) is reachable only via `@embedpdf/plugin-annotation/internal`.
-*/
-const AnnotationToken = AnnotationToken$1;
-//#endregion
 export { AnnotationToken, DEFAULT_CHROME, DEFAULT_TOOLS, MIN_DRAG, annotationPlugin, fromDTO, propsFor, refKey, resolveClickPlacement, styleFromDTO, toCreateDraft, toPatch, widgetAppearanceFromProps };
 
 //# sourceMappingURL=index.js.map