@libresign/pdf-elements 1.0.1 → 1.0.2

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as I, openBlock as m, createElementBlock as v, normalizeStyle as E, renderSlot as M, createElementVNode as P, withModifiers as R, createCommentVNode as $, normalizeClass as Y, Fragment as z, renderList as B, markRaw as y, resolveComponent as Z, createVNode as G, createBlock as J, withCtx as N, toDisplayString as U } from "vue";
+import { defineComponent as I, openBlock as m, createElementBlock as v, normalizeStyle as E, renderSlot as M, createElementVNode as P, withModifiers as R, createCommentVNode as $, normalizeClass as Y, Fragment as z, renderList as B, markRaw as y, resolveComponent as Z, createVNode as K, createBlock as J, withCtx as N, toDisplayString as U } from "vue";
 const Q = I({
   name: "PDFPage",
   emits: ["onMeasure"],
@@ -419,43 +419,51 @@ function oe(e, t, i, s, o, a) {
 }
 const ae = /* @__PURE__ */ V(ie, [["render", oe], ["__scopeId", "data-v-c700849e"]]);
 let H = null, A = null, W = null, X = null;
-function re() {
-  return A || (A = import("./pdf-uHvE5neP.mjs")), A;
+function re(e) {
+  const t = e;
+  return t.default?.PDFWorker ? t.default : t;
 }
 function he() {
+  return A || (A = import("./pdf-uHvE5neP.mjs").then(re)), A;
+}
+function le() {
   return W || (W = import("./pdf.worker.min-DmO9Xdfo.mjs").then(
     (e) => e.default
   )), W;
 }
-async function le(e) {
-  if (X) {
-    e.GlobalWorkerOptions.workerSrc = X;
-    return;
+async function ce(e) {
+  if (e?.GlobalWorkerOptions) {
+    if (X) {
+      e.GlobalWorkerOptions.workerSrc = X;
+      return;
+    }
+    e.GlobalWorkerOptions.workerSrc || (e.GlobalWorkerOptions.workerSrc = await le());
   }
-  e.GlobalWorkerOptions.workerSrc || (e.GlobalWorkerOptions.workerSrc = await he());
 }
-async function ce(e) {
-  return H || (await le(e), H = new e.PDFWorker({})), H;
+async function de(e) {
+  return H || (await ce(e), H = new e.PDFWorker({})), H;
 }
-function je(e) {
-  X = e, A && A.then((t) => {
-    t.GlobalWorkerOptions.workerSrc = e;
+function Ce(e) {
+  X = e, H = null, A && A.then((t) => {
+    t?.GlobalWorkerOptions && (t.GlobalWorkerOptions.workerSrc = e);
+  }).catch((t) => {
+    console.warn("setWorkerPath: failed to update pdfjs workerSrc immediately", t);
   });
 }
-function K(e) {
+function G(e) {
   return new Promise((t, i) => {
     const s = new FileReader();
     s.onload = () => t(s.result), s.onerror = i, s.readAsArrayBuffer(e);
   });
 }
 async function x(e, t = {}) {
-  const i = await re(), s = await ce(i), o = e instanceof ArrayBuffer, a = ArrayBuffer.isView(e), n = typeof Blob < "u" && e instanceof Blob;
+  const i = await he(), s = await de(i), o = e instanceof ArrayBuffer, a = ArrayBuffer.isView(e), n = typeof Blob < "u" && e instanceof Blob;
   if (e && typeof e == "object" && !o && !a && !n)
     return i.getDocument({ ...e, ...t, worker: s }).promise;
   if (typeof e == "string")
     return i.getDocument({ url: e, ...t, worker: s }).promise;
   if (n) {
-    const r = await K(e);
+    const r = await G(e);
     return i.getDocument({ data: r, ...t, worker: s }).promise;
   }
   const h = o ? e : new Uint8Array(
@@ -471,17 +479,17 @@ function F(e, t, i, s, o, a) {
     y: Math.max(0, Math.min(t, a - s))
   };
 }
-function de(e, t, i, s, o, a) {
+function ge(e, t, i, s, o, a) {
   const n = Math.max(0, e), h = Math.max(0, t), r = Math.min(o, e + i), l = Math.min(a, t + s);
   return r <= n || l <= h ? 0 : (r - n) * (l - h);
 }
-function ge(e, t, i = 300) {
+function ue(e, t, i = 300) {
   return {
     minY: Math.max(0, e - i),
     maxY: e + t + i
   };
 }
-function ue(e, t, i, s) {
+function fe(e, t, i, s) {
   return !(e + t < i || e > s);
 }
 function q(e, t) {
@@ -489,7 +497,7 @@ function q(e, t) {
     i.pagesScale = i.pagesScale.map(() => t);
   });
 }
-function fe(e, t) {
+function pe(e, t) {
   return !e || !t ? !1 : e.allObjects.some((i) => i.some((s) => s.id === t));
 }
 function L(e, t) {
@@ -499,19 +507,19 @@ function L(e, t) {
         return i;
   }
 }
-function pe(e, t, i, s) {
+function me(e, t, i, s) {
   const o = e?.allObjects?.[t];
   if (!o) return !1;
   const a = o.findIndex((n) => n.id === i);
   return a === -1 ? !1 : (o.splice(a, 1, { ...o[a], ...s }), !0);
 }
-function me(e, t, i) {
+function ve(e, t, i) {
   const s = e?.allObjects?.[t];
   if (!s) return !1;
   const o = s.findIndex((a) => a.id === i);
   return o === -1 ? !1 : (s.splice(o, 1), !0);
 }
-function ve(e, t, i, s) {
+function we(e, t, i, s) {
   const o = e[t];
   if (o)
     return o;
@@ -521,7 +529,7 @@ function ve(e, t, i, s) {
   };
   return e[t] = n, n;
 }
-const we = I({
+const be = I({
   name: "PDFElements",
   emits: ["pdf-elements:end-init", "pdf-elements:delete-object", "pdf-elements:object-click"],
   components: {
@@ -652,7 +660,7 @@ const we = I({
         const i = this.initFiles[t], s = this.initFileNames[t] || `document-${t + 1}.pdf`;
         let o;
         if (i instanceof Blob) {
-          const r = await K(i);
+          const r = await G(i);
           o = await x({ data: r }, this.pdfjsOptions);
         } else
           o = await x(i, this.pdfjsOptions);
@@ -723,14 +731,14 @@ const we = I({
       if (!this.isAddingMode && !this.isDraggingElement && s === this._lastPageBoundsScrollTop && o === this._lastPageBoundsClientHeight)
         return;
       this._lastPageBoundsScrollTop = s, this._lastPageBoundsClientHeight = o;
-      const { minY: a, maxY: n } = ge(s, o);
+      const { minY: a, maxY: n } = ue(s, o);
       for (let h = 0; h < this.pdfDocuments.length; h++)
         for (let r = 0; r < this.pdfDocuments[h].pages.length; r++) {
           const l = this.getPageCanvasElement(h, r);
           if (!l) continue;
           if (o) {
             const d = l.closest(".page-wrapper") || l, g = d.offsetTop || 0, f = d.offsetHeight || 0;
-            if (!ue(g, f, a, n))
+            if (!fe(g, f, a, n))
               continue;
           }
           const u = l.getBoundingClientRect(), c = {
@@ -925,15 +933,15 @@ const we = I({
       const i = `${e}-${t}`;
       if (this.objectIndexCache[i] !== void 0) return !0;
       const s = this.pdfDocuments[e];
-      return fe(s, t);
+      return pe(s, t);
     },
     updateObjectInPage(e, t, i, s) {
       const o = this.pdfDocuments[e];
-      pe(o, t, i, s);
+      me(o, t, i, s);
     },
     removeObjectFromPage(e, t, i) {
       const s = this.pdfDocuments[e];
-      me(s, t, i);
+      ve(s, t, i);
     },
     getAllObjects(e = this.selectedDocIndex) {
       if (e < 0 || e >= this.pdfDocuments.length) return [];
@@ -984,7 +992,7 @@ const we = I({
           }
           let g = a, f = 0;
           for (let p = 0; p < s.pages.length; p++) {
-            const O = this.getPageWidth(e, p), S = this.getPageHeight(e, p), w = de(h, r, l, u, O, S);
+            const O = this.getPageWidth(e, p), S = this.getPageHeight(e, p), w = ge(h, r, l, u, O, S);
             w > f && (f = w, g = p);
           }
           if (g !== a) {
@@ -1105,7 +1113,7 @@ const we = I({
     },
     getCachedMeasurement(e, t, i) {
       const s = `${e}-${t}`, a = this.pdfDocuments[e].pagesScale[t] || 1;
-      return ve(this._pageMeasurementCache, s, i, a);
+      return we(this._pageMeasurementCache, s, i, a);
     },
     calculateOptimalScale(e) {
       const t = this.$el?.clientWidth || 0;
@@ -1139,20 +1147,20 @@ const we = I({
       this.autoFitApplied = !0, Math.abs(i - this.scale) > 0.01 && (this.scale = i, this.visualScale = i, q(this.pdfDocuments, this.scale), this._pageMeasurementCache = y({}), this.cachePageBounds());
     }
   }
-}), be = {
+}), ye = {
   key: 0,
   class: "pages-container"
-}, ye = ["onMousedown", "onTouchstart"], Pe = ["onClick", "onTouchend"], Oe = {
+}, Pe = ["onMousedown", "onTouchstart"], Oe = ["onClick", "onTouchend"], De = {
   key: 0,
   class: "page-footer"
 };
-function De(e, t, i, s, o, a) {
+function Se(e, t, i, s, o, a) {
   const n = Z("PDFPage"), h = Z("DraggableElement");
   return m(), v("div", {
     style: E({ width: e.width, height: e.height }),
     class: "pdf-elements-root"
   }, [
-    e.pdfDocuments.length ? (m(), v("div", be, [
+    e.pdfDocuments.length ? (m(), v("div", ye, [
       (m(!0), v(z, null, B(e.pdfDocuments, (r, l) => (m(), v("div", { key: l }, [
         (m(!0), v(z, null, B(r.pages, (u, c) => (m(), v("div", {
           key: `${l}-${c}`,
@@ -1166,7 +1174,7 @@ function De(e, t, i, s, o, a) {
             P("div", {
               class: Y(["page-canvas", { "shadow-outline": l === e.selectedDocIndex && c === e.selectedPageIndex }])
             }, [
-              G(n, {
+              K(n, {
                 ref_for: !0,
                 ref: `page${l}-${c}`,
                 page: u,
@@ -1247,13 +1255,13 @@ function De(e, t, i, s, o, a) {
                   ]),
                   _: 2
                 }, 1032, ["object", "pages-scale", "page-width", "page-height", "read-only", "on-update", "on-delete", "on-duplicate", "on-drag-start", "on-drag-move", "on-drag-end", "is-being-dragged-globally", "dragging-client-pos", "current-doc-index", "current-page-index", "global-drag-doc-index", "global-drag-page-index", "show-selection-ui", "show-default-actions", "ignore-click-outside-selectors"]))), 128))
-              ], 40, Pe)
+              ], 40, Oe)
             ], 2),
-            e.showPageFooter ? (m(), v("div", Oe, [
+            e.showPageFooter ? (m(), v("div", De, [
               P("span", null, U(r.name), 1),
               P("span", null, U(e.formatPageNumber(c + 1, r.numPages)), 1)
             ])) : $("", !0)
-          ], 40, ye)
+          ], 40, Pe)
         ]))), 128))
       ]))), 128))
     ])) : $("", !0),
@@ -1281,13 +1289,13 @@ function De(e, t, i, s, o, a) {
     ], 4)) : $("", !0)
   ], 4);
 }
-const T = /* @__PURE__ */ V(we, [["render", De], ["__scopeId", "data-v-eb792162"]]), Se = (e) => {
+const T = /* @__PURE__ */ V(be, [["render", Se], ["__scopeId", "data-v-eb792162"]]), Me = (e) => {
   const t = T.name || "PDFElements";
   e.component(t, T);
 };
-T.install = Se;
+T.install = Me;
 export {
   T as PDFElements,
   T as default,
-  je as setWorkerPath
+  Ce as setWorkerPath
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@libresign/pdf-elements",
   "description": "PDF viewer with draggable and resizable element overlays for Vue 3",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "author": "LibreCode <contact@librecode.coop>",
   "private": false,
   "main": "dist/index.js",

package/src/utils/asyncReader.ts

@@ -8,9 +8,16 @@ let pdfjsPromise: Promise<typeof import('pdfjs-dist')> | null = null
 let workerUrlPromise: Promise<string> | null = null
 let workerSrcOverride: string | null = null
 
+type PdfjsModule = typeof import('pdfjs-dist')
+
+function normalizePdfjs(mod: PdfjsModule): PdfjsModule {
+  const m = mod as PdfjsModule & { default?: PdfjsModule }
+  return (m.default?.PDFWorker ? m.default : m) as PdfjsModule
+}
+
 function loadPdfjs() {
   if (!pdfjsPromise) {
-    pdfjsPromise = import('pdfjs-dist')
+    pdfjsPromise = import('pdfjs-dist').then(normalizePdfjs)
   }
   return pdfjsPromise
 }
@@ -24,7 +31,10 @@ function loadWorkerUrl() {
   return workerUrlPromise
 }
 
-async function ensureWorkerSrc(pdfjs: typeof import('pdfjs-dist')) {
+async function ensureWorkerSrc(pdfjs: PdfjsModule) {
+  if (!pdfjs?.GlobalWorkerOptions) {
+    return
+  }
   if (workerSrcOverride) {
     pdfjs.GlobalWorkerOptions.workerSrc = workerSrcOverride
     return
@@ -34,7 +44,7 @@ async function ensureWorkerSrc(pdfjs: typeof import('pdfjs-dist')) {
   }
 }
 
-async function getSharedWorker(pdfjs: typeof import('pdfjs-dist')): Promise<PDFWorker> {
+async function getSharedWorker(pdfjs: PdfjsModule): Promise<PDFWorker> {
   if (!sharedWorker) {
     await ensureWorkerSrc(pdfjs)
     sharedWorker = new pdfjs.PDFWorker({}) as PDFWorker
@@ -44,9 +54,14 @@ async function getSharedWorker(pdfjs: typeof import('pdfjs-dist')): Promise<PDFW
 
 export function setWorkerPath(path: string) {
   workerSrcOverride = path
+  sharedWorker = null
   if (pdfjsPromise) {
     pdfjsPromise.then((pdfjs) => {
-      pdfjs.GlobalWorkerOptions.workerSrc = path
+      if (pdfjs?.GlobalWorkerOptions) {
+        pdfjs.GlobalWorkerOptions.workerSrc = path
+      }
+    }).catch((error) => {
+      console.warn('setWorkerPath: failed to update pdfjs workerSrc immediately', error)
     })
   }
 }