@vue-pdf-viewer/viewer 3.8.0-beta.0 → 3.8.0-beta.10

package/dist/types/components/utils/annotations.d.ts

@@ -1,5 +1,10 @@
 import type { PDFDocumentProxy } from 'pdfjs-dist';
 import type { AnnotationEventPayload } from '@/utils/types';
 declare const EVENTS_TO_HANDLER: string[];
-declare function annotationEventsHandler(evt: Event, PDFDoc: PDFDocumentProxy, Annotations: Object[], viewerRotation: number): AnnotationEventPayload | Promise<AnnotationEventPayload | undefined> | undefined;
-export { EVENTS_TO_HANDLER, annotationEventsHandler };
+declare function annotationEventsHandler(evt: Event, PDFDoc: PDFDocumentProxy, Annotations: Object[], viewerRotation: number, annotationStorage?: any): AnnotationEventPayload | Promise<AnnotationEventPayload | undefined> | undefined;
+/**
+ * Get the parent annotation element for a popup.
+ * Returns the cached annotation element that triggered this popup.
+ */
+declare function getPopupParentAnnotation(popupElement: HTMLElement): HTMLElement | null;
+export { EVENTS_TO_HANDLER, annotationEventsHandler, getPopupParentAnnotation };

package/dist/types/composables/useAnnotationHighlight.d.ts

@@ -1,4 +1,4 @@
-import { Ref } from 'vue';
+import { Ref, ShallowRef } from 'vue';
 import { AnnotationLayer, DrawLayer, PageViewport, PDFDocumentProxy, PDFPageProxy } from 'pdfjs-dist';
 import { AnnotationType } from '@vue-pdf-viewer/shared';
 import { AnnotationHighlight } from '@/utils/types';
@@ -9,35 +9,10 @@ interface UseAnnotationHighlightProps {
     textLayer: Ref<HTMLDivElement>;
     annotationLayer: Ref<AnnotationLayer>;
     document: PDFDocumentProxy;
+    /** Shared DrawLayer from parent - ensures unique IDs across all text selection types */
+    sharedDrawLayer: ShallowRef<DrawLayer | null>;
 }
 export declare const useAnnotationHighlight: (props: UseAnnotationHighlightProps) => {
-    drawLayer: Ref<{
-        pageIndex: any;
-        setParent: (parent: any) => void;
-        draw: (properties: any, isPathUpdatable?: boolean | undefined, hasClip?: boolean | undefined) => {
-            id: number;
-            clipPathId: string;
-        };
-        drawOutline: (properties: any, mustRemoveSelfIntersections: any) => number;
-        finalizeDraw: (id: any, properties: any) => void;
-        updateProperties: (elementOrId: any, properties: any) => void;
-        updateParent: (id: any, layer: any) => void;
-        remove: (id: any) => void;
-        destroy: () => void;
-    } | null, DrawLayer | {
-        pageIndex: any;
-        setParent: (parent: any) => void;
-        draw: (properties: any, isPathUpdatable?: boolean | undefined, hasClip?: boolean | undefined) => {
-            id: number;
-            clipPathId: string;
-        };
-        drawOutline: (properties: any, mustRemoveSelfIntersections: any) => number;
-        finalizeDraw: (id: any, properties: any) => void;
-        updateProperties: (elementOrId: any, properties: any) => void;
-        updateParent: (id: any, layer: any) => void;
-        remove: (id: any) => void;
-        destroy: () => void;
-    } | null>;
     isPrepared: Ref<boolean, boolean>;
     highlightAnnotations: Ref<{
         hexColor: string;

package/dist/types/composables/useAnnotationStorage.d.ts

@@ -1,6 +1,6 @@
 import { type Ref } from 'vue';
 import { type AnnotationPluginApi } from '@vue-pdf-viewer/shared';
-import type { PDFDocumentProxy } from 'pdfjs-dist/types/src/display/api';
+import type { PDFDocumentProxy, PDFPageProxy } from 'pdfjs-dist/types/src/display/api';
 /**
  * Set the global annotation plugin API reference
  * Called from usePlugins when the plugin is registered
@@ -71,6 +71,18 @@ export interface UseAnnotationStorageReturn {
     findEditorAnnotationKey: (annotationId: string) => string | undefined;
 }
 export declare const getGlobalStorageEntries: () => unknown[];
+/**
+ * Pre-set noView flag for Underline/StrikeOut annotations before canvas rendering.
+ * This prevents race condition where canvas renders these annotations before
+ * LayerAnnotationEditor has a chance to hide them.
+ *
+ * Why this is needed:
+ * - Highlight annotations are supported by PDF.js for editing, so they respond to isEditing flag
+ * - Underline (type 10) and StrikeOut (type 12) are NOT supported by PDF.js for editing
+ * - PDF.js renders them on canvas but does NOT respond to isEditing flag
+ * - We need to set noView: true BEFORE canvas rendering starts
+ */
+export declare function prepareTextMarkupAnnotationsForCanvas(pageProxy: PDFPageProxy, isTextSelectionActive: boolean): Promise<void>;
 /**
  * Creates a serializable version of the annotation data
  * @param value - The annotation data to serialize

package/dist/types/composables/useAnnotationStrikethrough.d.ts

@@ -1,6 +1,6 @@
 import { AnnotationHighlight } from '@/utils/types';
 import { AnnotationLayer, DrawLayer, PageViewport, PDFDocumentProxy, PDFPageProxy } from 'pdfjs-dist';
-import { Ref } from 'vue';
+import { Ref, ShallowRef } from 'vue';
 import { AnnotationType } from '@vue-pdf-viewer/shared';
 interface UseAnnotationStrikethroughProps {
     page: Ref<PDFPageProxy>;
@@ -9,6 +9,8 @@ interface UseAnnotationStrikethroughProps {
     textLayer: Ref<HTMLDivElement>;
     annotationLayer: Ref<AnnotationLayer>;
     document: PDFDocumentProxy;
+    /** Shared DrawLayer from parent - ensures unique IDs across all text selection types */
+    sharedDrawLayer: ShallowRef<DrawLayer | null>;
 }
 interface StrikethroughAnnotation extends AnnotationHighlight {
     isAddedNew?: boolean;
@@ -696,33 +698,6 @@ export declare const useAnnotationStrikethrough: (props: UseAnnotationStrikethro
         drawLayerId: number;
         strikethroughSvg?: SVGSVGElement | undefined;
     }>>;
-    drawLayer: Ref<{
-        pageIndex: any;
-        setParent: (parent: any) => void;
-        draw: (properties: any, isPathUpdatable?: boolean | undefined, hasClip?: boolean | undefined) => {
-            id: number;
-            clipPathId: string;
-        };
-        drawOutline: (properties: any, mustRemoveSelfIntersections: any) => number;
-        finalizeDraw: (id: any, properties: any) => void;
-        updateProperties: (elementOrId: any, properties: any) => void;
-        updateParent: (id: any, layer: any) => void;
-        remove: (id: any) => void;
-        destroy: () => void;
-    } | null, DrawLayer | {
-        pageIndex: any;
-        setParent: (parent: any) => void;
-        draw: (properties: any, isPathUpdatable?: boolean | undefined, hasClip?: boolean | undefined) => {
-            id: number;
-            clipPathId: string;
-        };
-        drawOutline: (properties: any, mustRemoveSelfIntersections: any) => number;
-        finalizeDraw: (id: any, properties: any) => void;
-        updateProperties: (elementOrId: any, properties: any) => void;
-        updateParent: (id: any, layer: any) => void;
-        remove: (id: any) => void;
-        destroy: () => void;
-    } | null>;
     isPrepared: Ref<boolean, boolean>;
     prepareStrikethroughElements: (editorActive: boolean) => Promise<void>;
     createStrikethroughFromBoxes: (boxes: Array<{

package/dist/types/composables/useAnnotationUnderline.d.ts

@@ -1,6 +1,6 @@
 import { AnnotationHighlight } from '@/utils/types';
 import { AnnotationLayer, DrawLayer, PageViewport, PDFDocumentProxy, PDFPageProxy } from 'pdfjs-dist';
-import { Ref } from 'vue';
+import { Ref, ShallowRef } from 'vue';
 import { AnnotationType } from '@vue-pdf-viewer/shared';
 interface UseAnnotationUnderlineProps {
     page: Ref<PDFPageProxy>;
@@ -9,6 +9,8 @@ interface UseAnnotationUnderlineProps {
     textLayer: Ref<HTMLDivElement>;
     annotationLayer: Ref<AnnotationLayer>;
     document: PDFDocumentProxy;
+    /** Shared DrawLayer from parent - ensures unique IDs across all text selection types */
+    sharedDrawLayer: ShallowRef<DrawLayer | null>;
 }
 interface UnderlineAnnotation extends AnnotationHighlight {
     isAddedNew?: boolean;
@@ -696,33 +698,6 @@ export declare const useAnnotationUnderline: (props: UseAnnotationUnderlineProps
         drawLayerId: number;
         underlineSvg?: SVGSVGElement | undefined;
     }>>;
-    drawLayer: Ref<{
-        pageIndex: any;
-        setParent: (parent: any) => void;
-        draw: (properties: any, isPathUpdatable?: boolean | undefined, hasClip?: boolean | undefined) => {
-            id: number;
-            clipPathId: string;
-        };
-        drawOutline: (properties: any, mustRemoveSelfIntersections: any) => number;
-        finalizeDraw: (id: any, properties: any) => void;
-        updateProperties: (elementOrId: any, properties: any) => void;
-        updateParent: (id: any, layer: any) => void;
-        remove: (id: any) => void;
-        destroy: () => void;
-    } | null, DrawLayer | {
-        pageIndex: any;
-        setParent: (parent: any) => void;
-        draw: (properties: any, isPathUpdatable?: boolean | undefined, hasClip?: boolean | undefined) => {
-            id: number;
-            clipPathId: string;
-        };
-        drawOutline: (properties: any, mustRemoveSelfIntersections: any) => number;
-        finalizeDraw: (id: any, properties: any) => void;
-        updateProperties: (elementOrId: any, properties: any) => void;
-        updateParent: (id: any, layer: any) => void;
-        remove: (id: any) => void;
-        destroy: () => void;
-    } | null>;
     isPrepared: Ref<boolean, boolean>;
     prepareUnderlineElements: (editorActive: boolean) => Promise<void>;
     createUnderlineFromBoxes: (boxes: Array<{

package/dist/types/const.d.ts

@@ -35,8 +35,8 @@ export declare const MIN_ZOOM_SCALE = 0.25;
 export declare const MAX_ZOOM_SCALE = 10;
 export declare const DEFAULT_SCALE_DELTA = 1.1;
 export declare const ANNOTATION_OUTLINE_BORDER_WIDTH = 0.0025;
-export declare const ANNOTATION_OUTLINE_INNER_MARGIN = 0;
-export declare const TEXT_MARKUP_LINE_THICKNESS = 0.15;
+export declare const ANNOTATION_OUTLINE_INNER_MARGIN = 0.00025;
+export declare const TEXT_MARKUP_LINE_THICKNESS = 0.075;
 export declare const SCROLL_BAR_WIDTH = 20;
 export declare const PAGE_PADDING = 1;
 export declare const PAGE_OFFSET = 0;

package/dist/types/utils/popup-bounds.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Utility for adjusting PDF.js annotation popup position to stay within viewer bounds.
+ * Popups use percentage-based positioning relative to their page.
+ * The popup should stay visually connected to its parent annotation.
+ */
+export interface PopupBoundsResult {
+    needsAdjustment: boolean;
+    left?: string;
+    top?: string;
+}
+/**
+ * Check if a popup overflows the container bounds and calculate adjusted position.
+ * The popup will try to stay adjacent to its parent annotation, flipping sides if needed.
+ *
+ * @param popup - The .popup element inside .popupAnnotation
+ * @param container - The scroll container (.vpv-pages-inner-container)
+ * @param page - The annotation layer element (.vpv-annotation-layer)
+ * @param annotationRect - Bounding rect of the parent annotation element
+ * @returns Adjustment result with new percentage-based left/top if needed
+ */
+export declare function adjustPopupBounds(popup: HTMLElement, container: HTMLElement, page: HTMLElement, annotationRect: DOMRect | null): PopupBoundsResult;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vue-pdf-viewer/viewer",
   "private": false,
-  "version": "3.8.0-beta.0",
+  "version": "3.8.0-beta.10",
   "type": "module",
   "main": "./dist/index.umd.cjs",
   "module": "./dist/index.js",
@@ -60,7 +60,7 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@vue-pdf-viewer/shared": "1.2.0-rc.16",
+    "@vue-pdf-viewer/shared": "1.2.0",
     "@vueuse/core": "^13.6.0",
     "node-forge": "^1.3.2",
     "pdfjs-dist": "4.10.38",