@readium/navigator-html-injectables 2.0.0-beta.1 → 2.0.0-beta.2

package/dist/index.js

@@ -172,22 +172,22 @@ class l {
     } else
       throw new Error("Invalid media type");
     const o = {};
-    for (let u = 1; u < s.length; u++) {
-      const f = s[u].split("=");
+    for (let d = 1; d < s.length; d++) {
+      const f = s[d].split("=");
       if (f.length === 2) {
         const g = f[0].toLocaleLowerCase(), m = g === "charset" ? f[1].toUpperCase() : f[1];
         o[g] = m;
       }
     }
-    const a = {}, h = Object.keys(o);
-    h.sort((u, f) => u.localeCompare(f)), h.forEach((u) => a[u] = o[u]);
-    let c = "";
-    for (const u in a) {
-      const f = a[u];
-      c += `;${u}=${f}`;
+    const a = {}, c = Object.keys(o);
+    c.sort((d, f) => d.localeCompare(f)), c.forEach((d) => a[d] = o[d]);
+    let h = "";
+    for (const d in a) {
+      const f = a[d];
+      h += `;${d}=${f}`;
     }
-    const d = `${t}/${i}${c}`, p = a.encoding;
-    this.string = d, this.type = t, this.subtype = i, this.parameters = a, this.encoding = p, this.name = e.name, this.fileExtension = e.fileExtension;
+    const u = `${t}/${i}${h}`, p = a.encoding;
+    this.string = u, this.type = t, this.subtype = i, this.parameters = a, this.encoding = p, this.name = e.name, this.fileExtension = e.fileExtension;
   }
   static parse(e) {
     return new l(e);
@@ -683,8 +683,8 @@ class x {
       "totalProgression",
       "position"
     ]);
-    return Object.entries(e).forEach(([a, h]) => {
-      o.has(a) || n.set(a, h);
+    return Object.entries(e).forEach(([a, c]) => {
+      o.has(a) || n.set(a, c);
     }), new x({
       fragments: We(e.fragments || e.fragment),
       progression: t !== void 0 && t >= 0 && t <= 1 ? t : void 0,
@@ -791,8 +791,8 @@ class B {
         duration: C(e.duration),
         bitrate: C(e.bitrate),
         languages: We(e.language),
-        alternates: q.deserialize(e.alternate),
-        children: q.deserialize(e.children)
+        alternates: V.deserialize(e.alternate),
+        children: V.deserialize(e.children)
       });
   }
   /**
@@ -852,7 +852,7 @@ class B {
     });
   }
 }
-class q {
+class V {
   /**
    * Creates a [Links].
    */
@@ -864,7 +864,7 @@ class q {
    */
   static deserialize(e) {
     if (e && e instanceof Array)
-      return new q(
+      return new V(
         e.map((t) => B.deserialize(t)).filter((t) => t !== void 0)
       );
   }
@@ -946,7 +946,7 @@ class q {
     return this.items.filter((e) => e.type);
   }
 }
-class V {
+class q {
   /**
    * Creates a [DomRange].
    */
@@ -963,7 +963,7 @@ class V {
     if (t === void 0)
       return;
     let i = C(e.charOffset);
-    return i === void 0 && (i = C(e.offset)), new V({
+    return i === void 0 && (i = C(e.offset)), new q({
       cssSelector: e.cssSelector,
       textNodeIndex: t,
       charOffset: i
@@ -993,11 +993,11 @@ class re {
   static deserialize(e) {
     if (!e)
       return;
-    let t = V.deserialize(e.start);
+    let t = q.deserialize(e.start);
     if (t)
       return new re({
         start: t,
-        end: V.deserialize(e.end)
+        end: q.deserialize(e.end)
       });
   }
   /**
@@ -1232,15 +1232,15 @@ function Ee(r = "unknown problem", ...e) {
   console.warn(`${ct}: ${r}`, ...e);
 }
 P.id, P.class, P.tag, P.attribute, Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY;
-function dt(r) {
+function ut(r) {
   return r instanceof RegExp;
 }
-function ut(r) {
+function dt(r) {
   return r.replace(/[|\\{}()[\]^$+?.]/g, "\\$&").replace(/\*/g, ".+");
 }
 function pt(r) {
   const e = r.map((t) => {
-    if (dt(t))
+    if (ut(t))
       return (i) => t.test(i);
     if (typeof t == "function")
       return (i) => {
@@ -1248,7 +1248,7 @@ function pt(r) {
         return typeof s != "boolean" ? (Ee("pattern matcher function invalid", "Provided pattern matching function does not return boolean. It's result will be ignored.", t), !1) : s;
       };
     if (typeof t == "string") {
-      const i = new RegExp("^" + ut(t) + "$");
+      const i = new RegExp("^" + dt(t) + "$");
       return (s) => i.test(s);
     }
     return Ee("pattern matcher invalid", "Pattern matching only accepts strings, regular expressions and/or functions. This item is invalid and will be ignored.", t), () => !1;
@@ -1274,7 +1274,7 @@ function yt(r, e, t) {
   return t.map((s) => {
     const n = Math.max(0, s.end - e.length - s.errors), o = be(r.slice(n, s.end));
     return {
-      start: Fe(o, i, s.errors).reduce((h, c) => s.end - c.end < h ? s.end - c.end : h, s.end),
+      start: Fe(o, i, s.errors).reduce((c, h) => s.end - h.end < c ? s.end - h.end : c, s.end),
       end: s.end,
       errors: s.errors
     };
@@ -1285,10 +1285,10 @@ function Z(r) {
 }
 function xe(r, e, t, i) {
   let s = r.P[t], n = r.M[t];
-  const o = i >>> 31, a = e[t] | o, h = a | n, c = (a & s) + s ^ s | a;
-  let d = n | ~(c | s), p = s & c;
-  const u = Z(d & r.lastRowMask[t]) - Z(p & r.lastRowMask[t]);
-  return d <<= 1, p <<= 1, p |= o, d |= Z(i) - o, s = p | ~(h | d), n = d & h, r.P[t] = s, r.M[t] = n, u;
+  const o = i >>> 31, a = e[t] | o, c = a | n, h = (a & s) + s ^ s | a;
+  let u = n | ~(h | s), p = s & h;
+  const d = Z(u & r.lastRowMask[t]) - Z(p & r.lastRowMask[t]);
+  return u <<= 1, p <<= 1, p |= o, u |= Z(i) - o, s = p | ~(c | u), n = u & c, r.P[t] = s, r.M[t] = n, d;
 }
 function Fe(r, e, t) {
   if (e.length === 0)
@@ -1300,15 +1300,15 @@ function Fe(r, e, t) {
     lastRowMask: new Uint32Array(n + 1)
   };
   o.lastRowMask.fill(1 << 31), o.lastRowMask[n] = 1 << (e.length - 1) % s;
-  const a = new Uint32Array(n + 1), h = /* @__PURE__ */ new Map(), c = [];
-  for (let u = 0; u < 256; u++)
-    c.push(a);
-  for (let u = 0; u < e.length; u += 1) {
-    const f = e.charCodeAt(u);
-    if (h.has(f))
+  const a = new Uint32Array(n + 1), c = /* @__PURE__ */ new Map(), h = [];
+  for (let d = 0; d < 256; d++)
+    h.push(a);
+  for (let d = 0; d < e.length; d += 1) {
+    const f = e.charCodeAt(d);
+    if (c.has(f))
       continue;
     const g = new Uint32Array(n + 1);
-    h.set(f, g), f < c.length && (c[f] = g);
+    c.set(f, g), f < h.length && (h[f] = g);
     for (let m = 0; m <= n; m += 1) {
       g[m] = 0;
       for (let v = 0; v < s; v += 1) {
@@ -1319,37 +1319,37 @@ function Fe(r, e, t) {
       }
     }
   }
-  let d = Math.max(0, Math.ceil(t / s) - 1);
+  let u = Math.max(0, Math.ceil(t / s) - 1);
   const p = new Uint32Array(n + 1);
-  for (let u = 0; u <= d; u += 1)
-    p[u] = (u + 1) * s;
+  for (let d = 0; d <= u; d += 1)
+    p[d] = (d + 1) * s;
   p[n] = e.length;
-  for (let u = 0; u <= d; u += 1)
-    o.P[u] = -1, o.M[u] = 0;
-  for (let u = 0; u < r.length; u += 1) {
-    const f = r.charCodeAt(u);
+  for (let d = 0; d <= u; d += 1)
+    o.P[d] = -1, o.M[d] = 0;
+  for (let d = 0; d < r.length; d += 1) {
+    const f = r.charCodeAt(d);
     let g;
-    f < c.length ? g = c[f] : (g = h.get(f), typeof g > "u" && (g = a));
+    f < h.length ? g = h[f] : (g = c.get(f), typeof g > "u" && (g = a));
     let m = 0;
-    for (let v = 0; v <= d; v += 1)
+    for (let v = 0; v <= u; v += 1)
       m = xe(o, g, v, m), p[v] += m;
-    if (p[d] - m <= t && d < n && (g[d + 1] & 1 || m < 0)) {
-      d += 1, o.P[d] = -1, o.M[d] = 0;
+    if (p[u] - m <= t && u < n && (g[u + 1] & 1 || m < 0)) {
+      u += 1, o.P[u] = -1, o.M[u] = 0;
       let v;
-      if (d === n) {
+      if (u === n) {
         const S = e.length % s;
         v = S === 0 ? s : S;
       } else
         v = s;
-      p[d] = p[d - 1] + v - m + xe(o, g, d, m);
+      p[u] = p[u - 1] + v - m + xe(o, g, u, m);
     } else
-      for (; d > 0 && p[d] >= t + s; )
-        d -= 1;
-    d === n && p[d] <= t && (p[d] < t && i.splice(0, i.length), i.push({
+      for (; u > 0 && p[u] >= t + s; )
+        u -= 1;
+    u === n && p[u] <= t && (p[u] < t && i.splice(0, i.length), i.push({
       start: -1,
-      end: u + 1,
-      errors: p[d]
-    }), t = p[d]);
+      end: d + 1,
+      errors: p[u]
+    }), t = p[u]);
   }
   return i;
 }
@@ -1378,7 +1378,7 @@ function Et(r, e, t = {}) {
   if (s.length === 0)
     return null;
   const n = (a) => {
-    const u = 1 - a.errors / e.length, f = t.prefix ? Se(
+    const d = 1 - a.errors / e.length, f = t.prefix ? Se(
       r.slice(
         Math.max(0, a.start - t.prefix.length),
         a.start
@@ -1390,14 +1390,14 @@ function Et(r, e, t = {}) {
     ) : 1;
     let m = 1;
     typeof t.hint == "number" && (m = 1 - Math.abs(a.start - t.hint) / r.length);
-    const v = 50 * u + 20 * f + 20 * g + 2 * m, S = 50 + 20 + 20 + 2;
+    const v = 50 * d + 20 * f + 20 * g + 2 * m, S = 50 + 20 + 20 + 2;
     return v / S;
   }, o = s.map((a) => ({
     start: a.start,
     end: a.end,
     score: n(a)
   }));
-  return o.sort((a, h) => h.score - a.score), o[0];
+  return o.sort((a, c) => c.score - a.score), o[0];
 }
 function J(r, e, t) {
   const i = t === 1 ? e : e - 1;
@@ -1409,7 +1409,7 @@ function J(r, e, t) {
   const o = s.length - n.length;
   return t === 2 ? e - o : e + o;
 }
-function Te(r, e) {
+function we(r, e) {
   const t = r.commonAncestorContainer.ownerDocument.createNodeIterator(
     r.commonAncestorContainer,
     NodeFilter.SHOW_TEXT
@@ -1421,8 +1421,8 @@ function Te(r, e) {
   let o = -1;
   const a = () => {
     if (n = e === 1 ? t.nextNode() : t.previousNode(), n) {
-      const h = n.textContent, c = e === 1 ? 0 : h.length;
-      o = J(h, c, e);
+      const c = n.textContent, h = e === 1 ? 0 : c.length;
+      o = J(c, h, e);
     }
   };
   for (; n && o === -1 && n !== s; )
@@ -1457,7 +1457,7 @@ function bt(r) {
   if (s.start >= 0 && (e.setStart(r.startContainer, s.start), t = !0), s.end > 0 && (e.setEnd(r.endContainer, s.end), i = !0), t && i)
     return e;
   if (!t) {
-    const { node: n, offset: o } = Te(
+    const { node: n, offset: o } = we(
       e,
       1
       /* Forwards */
@@ -1465,7 +1465,7 @@ function bt(r) {
     n && o >= 0 && e.setStart(n, o);
   }
   if (!i) {
-    const { node: n, offset: o } = Te(
+    const { node: n, offset: o } = we(
       e,
       2
       /* Backwards */
@@ -1484,7 +1484,7 @@ function Ue(r) {
       return 0;
   }
 }
-function we(r) {
+function Te(r) {
   let e = r.previousSibling, t = 0;
   for (; e; )
     t += Ue(e), e = e.previousSibling;
@@ -1522,7 +1522,7 @@ class M {
       throw new Error("Parent is not an ancestor of current element");
     let t = this.element, i = this.offset;
     for (; t !== e; )
-      i += we(t), t = t.parentElement;
+      i += Te(t), t = t.parentElement;
     return new M(t, i);
   }
   /**
@@ -1587,7 +1587,7 @@ class M {
           throw new Error("Text node offset is out of range");
         if (!e.parentElement)
           throw new Error("Text node has no parent");
-        const i = we(e) + t;
+        const i = Te(e) + t;
         return new M(e.parentElement, i);
       }
       case Node.ELEMENT_NODE: {
@@ -1782,25 +1782,25 @@ function St(r, e) {
   let t = r.getClientRects();
   t.length || r.commonAncestorContainer.nodeType === Node.ELEMENT_NODE && (t = r.commonAncestorContainer.getClientRects());
   const i = 1, s = [];
-  for (const c of t)
+  for (const h of t)
     s.push({
-      bottom: c.bottom,
-      height: c.height,
-      left: c.left,
-      right: c.right,
-      top: c.top,
-      width: c.width
+      bottom: h.bottom,
+      height: h.height,
+      left: h.left,
+      right: h.right,
+      top: h.top,
+      width: h.width
     });
   const n = He(
     s,
     i,
     e
-  ), o = wt(n, i), a = $e(o), h = 2 * 2;
-  for (let c = a.length - 1; c >= 0; c--) {
-    const d = a[c];
-    if (!(d.width * d.height > h))
+  ), o = Tt(n, i), a = $e(o), c = 2 * 2;
+  for (let h = a.length - 1; h >= 0; h--) {
+    const u = a[h];
+    if (!(u.width * u.height > c))
       if (a.length > 1)
-        a.splice(c, 1);
+        a.splice(h, 1);
       else
         break;
   }
@@ -1812,11 +1812,11 @@ function He(r, e, t) {
       const n = r[i], o = r[s];
       if (n === o)
         continue;
-      const a = N(n.top, o.top, e) && N(n.bottom, o.bottom, e), h = N(n.left, o.left, e) && N(n.right, o.right, e);
-      if ((h && !t || a && !h) && je(n, o, e)) {
-        const u = r.filter((g) => g !== n && g !== o), f = Tt(n, o);
-        return u.push(f), He(
-          u,
+      const a = N(n.top, o.top, e) && N(n.bottom, o.bottom, e), c = N(n.left, o.left, e) && N(n.right, o.right, e);
+      if ((c && !t || a && !c) && je(n, o, e)) {
+        const d = r.filter((g) => g !== n && g !== o), f = wt(n, o);
+        return d.push(f), He(
+          d,
           e,
           t
         );
@@ -1824,7 +1824,7 @@ function He(r, e, t) {
     }
   return r;
 }
-function Tt(r, e) {
+function wt(r, e) {
   const t = Math.min(r.left, e.left), i = Math.max(r.right, e.right), s = Math.min(r.top, e.top), n = Math.max(r.bottom, e.bottom);
   return {
     bottom: n,
@@ -1835,7 +1835,7 @@ function Tt(r, e) {
     width: i - t
   };
 }
-function wt(r, e) {
+function Tt(r, e) {
   const t = new Set(r);
   for (const i of r) {
     if (!(i.width > 1 && i.height > 1)) {
@@ -1866,11 +1866,11 @@ function $e(r) {
         if (a.length === 1)
           n = a, o = i;
         else {
-          const c = Ce(s, i);
-          a.length < c.length ? (n = a, o = i) : (n = c, o = s);
+          const h = Ce(s, i);
+          a.length < h.length ? (n = a, o = i) : (n = h, o = s);
         }
-        const h = r.filter((c) => c !== o);
-        return Array.prototype.push.apply(h, n), $e(h);
+        const c = r.filter((h) => h !== o);
+        return Array.prototype.push.apply(c, n), $e(c);
       }
     }
   return r;
@@ -1943,14 +1943,14 @@ function je(r, e, t) {
 function N(r, e, t) {
   return Math.abs(r - e) <= t;
 }
-function qe(r) {
+function Ve(r) {
   const e = {}, t = r.document.documentElement.style;
   for (const i in r.document.documentElement.style)
     Object.hasOwn(t, i) && !Number.isNaN(Number.parseInt(i)) && (e[t[i]] = t.getPropertyValue(t[i]));
   return e;
 }
 function Nt(r, e) {
-  const t = qe(r);
+  const t = Ve(r);
   Object.keys(t).forEach((i) => {
     e.hasOwnProperty(i) || he(r, i);
   }), Object.entries(e).forEach(([i, s]) => {
@@ -2020,14 +2020,14 @@ class zt {
    * @param decoration Decoration to add
    */
   add(e) {
-    var o, a, h, c;
+    var o, a, c, h;
     const t = `${this.id}-${this.lastItemId++}`, i = le(this.wnd.document, e.locator);
     if (!i) {
       this.comms.log("Can't locate DOM range for decoration", e);
       return;
     }
     const s = i.commonAncestorContainer;
-    s.nodeType !== Node.TEXT_NODE && this.experimentalHighlights && (Ne.includes(s.nodeName.toUpperCase()) && ((o = this.notTextFlag) == null || o.set(t, !0)), s.querySelector(Ne.join(", ").toLowerCase()) && ((a = this.notTextFlag) == null || a.set(t, !0)), (((h = s.textContent) == null ? void 0 : h.trim()) || "").length === 0 && ((c = this.notTextFlag) == null || c.set(t, !0)));
+    s.nodeType !== Node.TEXT_NODE && this.experimentalHighlights && (Ne.includes(s.nodeName.toUpperCase()) && ((o = this.notTextFlag) == null || o.set(t, !0)), s.querySelector(Ne.join(", ").toLowerCase()) && ((a = this.notTextFlag) == null || a.set(t, !0)), (((c = s.textContent) == null ? void 0 : c.trim()) || "").length === 0 && ((h = this.notTextFlag) == null || h.set(t, !0)));
     const n = {
       decoration: e,
       id: t,
@@ -2095,30 +2095,30 @@ class zt {
       getComputedStyle(this.wnd.document.documentElement).getPropertyValue(
         "column-count"
       )
-    ), n = i / (s || 1), o = this.wnd.document.scrollingElement, a = o.scrollLeft, h = o.scrollTop, c = (y, b, I) => {
-      var ce, de, ue, pe, fe, me;
-      if (y.style.position = "absolute", ((de = (ce = e.decoration) == null ? void 0 : ce.style) == null ? void 0 : de.width) === "viewport") {
+    ), n = i / (s || 1), o = this.wnd.document.scrollingElement, a = o.scrollLeft, c = o.scrollTop, h = (y, b, I) => {
+      var ce, ue, de, pe, fe, me;
+      if (y.style.position = "absolute", ((ue = (ce = e.decoration) == null ? void 0 : ce.style) == null ? void 0 : ue.width) === "viewport") {
         y.style.width = `${i}px`, y.style.height = `${b.height}px`;
         let K = Math.floor(b.left / i) * i;
-        y.style.left = `${K + a}px`, y.style.top = `${b.top + h}px`;
-      } else if (((pe = (ue = e.decoration) == null ? void 0 : ue.style) == null ? void 0 : pe.width) === "bounds")
-        y.style.width = `${I.width}px`, y.style.height = `${b.height}px`, y.style.left = `${I.left + a}px`, y.style.top = `${b.top + h}px`;
+        y.style.left = `${K + a}px`, y.style.top = `${b.top + c}px`;
+      } else if (((pe = (de = e.decoration) == null ? void 0 : de.style) == null ? void 0 : pe.width) === "bounds")
+        y.style.width = `${I.width}px`, y.style.height = `${b.height}px`, y.style.left = `${I.left + a}px`, y.style.top = `${b.top + c}px`;
       else if (((me = (fe = e.decoration) == null ? void 0 : fe.style) == null ? void 0 : me.width) === "page") {
         y.style.width = `${n}px`, y.style.height = `${b.height}px`;
         let K = Math.floor(b.left / n) * n;
-        y.style.left = `${K + a}px`, y.style.top = `${b.top + h}px`;
+        y.style.left = `${K + a}px`, y.style.top = `${b.top + c}px`;
       } else
-        y.style.width = `${b.width}px`, y.style.height = `${b.height}px`, y.style.left = `${b.left + a}px`, y.style.top = `${b.top + h}px`;
-    }, d = e.range.getBoundingClientRect();
+        y.style.width = `${b.width}px`, y.style.height = `${b.height}px`, y.style.left = `${b.left + a}px`, y.style.top = `${b.top + c}px`;
+    }, u = e.range.getBoundingClientRect();
     let p = this.wnd.document.createElement("template");
-    const u = Pe(this.wnd, "--USER__appearance") === "readium-night-on" || Ot(Pe(this.wnd, "--USER__backgroundColor"));
+    const d = Pe(this.wnd, "--USER__appearance") === "readium-night-on" || Ot(Pe(this.wnd, "--USER__backgroundColor"));
     p.innerHTML = `
         <div
             class="r2-highlight-0"
             style="${[
       `background-color: ${((v = (m = e.decoration) == null ? void 0 : m.style) == null ? void 0 : v.tint) ?? "yellow"} !important`,
       //"opacity: 0.3 !important",
-      `mix-blend-mode: ${u ? "exclusion" : "multiply"} !important`,
+      `mix-blend-mode: ${d ? "exclusion" : "multiply"} !important`,
       "opacity: 1 !important",
       "box-sizing: border-box !important"
     ].join("; ")}"
@@ -2128,7 +2128,7 @@ class zt {
     const f = p.content.firstElementChild;
     if (((O = (S = e.decoration) == null ? void 0 : S.style) == null ? void 0 : O.layout) === "bounds") {
       const y = f.cloneNode(!0);
-      y.style.setProperty("pointer-events", "none"), c(y, d, d), t.append(y);
+      y.style.setProperty("pointer-events", "none"), h(y, u, u), t.append(y);
     } else {
       let y = St(
         e.range,
@@ -2138,7 +2138,7 @@ class zt {
       y = y.sort((b, I) => b.top < I.top ? -1 : b.top > I.top ? 1 : 0);
       for (let b of y) {
         const I = f.cloneNode(!0);
-        I.style.setProperty("pointer-events", "none"), c(I, b, d), t.append(I);
+        I.style.setProperty("pointer-events", "none"), h(I, b, u), t.append(I);
       }
     }
     e.container = t, e.clickableElements = Array.from(
@@ -2175,7 +2175,7 @@ class zt {
     this.experimentalHighlights && this.wnd.CSS.highlights.delete(this.id), this.container && (this.container.remove(), this.container = void 0);
   }
 }
-const Ve = class Q extends Y {
+const qe = class Q extends Y {
   constructor() {
     super(...arguments), this.resizeFrame = 0, this.lastGroupId = 0, this.groups = /* @__PURE__ */ new Map(), this.handleResizer = this.handleResize.bind(this);
   }
@@ -2220,8 +2220,8 @@ const Ve = class Q extends Y {
     return e.removeEventListener("orientationchange", this.handleResizer), e.removeEventListener("resize", this.handleResizer), t.unregisterAll(Q.moduleName), this.resizeObserver.disconnect(), this.cleanup(), t.log("Decorator Unmounted"), !0;
   }
 };
-Ve.moduleName = "decorator";
-let Dt = Ve;
+qe.moduleName = "decorator";
+let Dt = qe;
 const Ae = "readium-snapper-style", _e = class ee extends Y {
   constructor() {
     super(...arguments), this.protected = !1;
@@ -2263,20 +2263,24 @@ function Me(r) {
   return r.clientHeight - t - i;
 }
 function Oe(r) {
-  const e = r.document.querySelectorAll("div[id^='readium-virtual-page']");
-  for (const a of e)
-    a.remove();
-  const t = Ge(r), i = r.document.scrollingElement.scrollWidth, s = Math.ceil(i / r.innerWidth) * t, n = Math.round(i / r.innerWidth * t), o = t === 1 ? 0 : s - n;
-  if (o > 0)
-    for (let a = 0; a < o; a++) {
-      const h = r.document.createElement("div");
-      h.setAttribute("id", `readium-virtual-page-${a}`), h.dataset.readium = "true", CSS.supports("break-before", "column") ? h.style.breakBefore = "column" : (CSS.supports("break-inside", "avoid-column") && (h.style.breakInside = "avoid-column"), h.style.height = Me(r.document.documentElement) + "px"), h.innerHTML = "&#8203;", r.document.body.appendChild(h);
+  const e = Ge(r);
+  if (!e)
+    return !1;
+  const t = r.document.querySelectorAll("div[id^='readium-virtual-page']");
+  for (const h of t)
+    h.remove();
+  const i = t.length, s = r.document.scrollingElement.scrollWidth, n = r.visualViewport.width, a = Math.round(s / n * e) % e, c = e === 1 || a === 0 ? 0 : e - a;
+  if (c > 0)
+    for (let h = 0; h < c; h++) {
+      const u = r.document.createElement("div");
+      u.setAttribute("id", `readium-virtual-page-${h}`), u.dataset.readium = "true", CSS.supports("break-before", "column") ? u.style.breakBefore = "column" : (CSS.supports("break-inside", "avoid-column") && (u.style.breakInside = "avoid-column"), u.style.height = Me(r.document.documentElement) + "px"), u.innerHTML = "&#8203;", r.document.body.appendChild(u);
     }
+  return i !== c;
 }
 function Wt(r) {
   return r < 0.5 ? 2 * r * r : -1 + (4 - 2 * r) * r;
 }
-function T(r) {
+function w(r) {
   const e = r.getSelection();
   e && e.removeAllRanges();
 }
@@ -2344,7 +2348,7 @@ function kt(r) {
   }
   return !1;
 }
-const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
+const Ie = "readium-column-snapper-style", Ht = 200, Je = class T extends Xe {
   constructor() {
     super(...arguments), this.shakeTimeout = 0, this.snappingCancelled = !1, this.alreadyScrollLeft = 0, this.overscroll = 0, this.cachedScrollWidth = 0, this.touchState = 0, this.startingX = void 0, this.endingX = void 0, this.onTouchStarter = this.onTouchStart.bind(this), this.onTouchEnder = this.onTouchEnd.bind(this), this.onWidthChanger = this.onWidthChange.bind(this), this.onTouchMover = this.onTouchMove.bind(this);
   }
@@ -2380,13 +2384,13 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
   }
   // Snaps the current offset to the page width.
   snapCurrentOffset(e = !1, t = !1) {
-    const i = this.wnd.scrollX > 0 ? this.wnd.scrollX : this.alreadyScrollLeft, s = this.doc(), n = this.dragOffset(), o = Ge(this.wnd), a = Math.min(Math.max(0, i), this.cachedScrollWidth), h = W(this.wnd) ? -1 : 1, c = (
+    const i = this.wnd.scrollX > 0 ? this.wnd.scrollX : this.alreadyScrollLeft, s = this.doc(), n = this.dragOffset(), o = Ge(this.wnd), a = Math.min(Math.max(0, i), this.cachedScrollWidth), c = W(this.wnd) ? -1 : 1, h = (
       // The hurdle to overcome in order to change pages
-      h * (this.wnd.innerWidth / 3) * (h * n > 0 ? 2 : 1)
-    ), d = this.snapOffset(a + c);
-    if (e && d !== this.scrollOffset()) {
+      c * (this.wnd.innerWidth / 3) * (c * n > 0 ? 2 : 1)
+    ), u = this.snapOffset(a + h);
+    if (e && u !== this.scrollOffset()) {
       this.snappingCancelled = !1;
-      const p = (m, v, S, O) => S > O ? v : m + (v - m) * Wt(S / O), u = (
+      const p = (m, v, S, O) => S > O ? v : m + (v - m) * Wt(S / O), d = (
         /*Math.abs(startX - (this.useTransform ? currentOffset : 0)) < 10 ? 1 : */
         Ht * o
       );
@@ -2395,13 +2399,13 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
         if (this.snappingCancelled)
           return;
         f || (f = m);
-        const v = m - f, S = p(this.overscroll, 0, v, u), O = p(i, d, v, u);
-        s.scrollLeft = O, this.overscroll !== 0 && (s.style.transform = `translate3d(${-S}px, 0px, 0px)`), v < u ? this.wnd.requestAnimationFrame(g) : (this.clearTouches(), s.style.removeProperty("transform"), s.scrollLeft = d, t || this.reportProgress());
+        const v = m - f, S = p(this.overscroll, 0, v, d), O = p(i, u, v, d);
+        s.scrollLeft = O, this.overscroll !== 0 && (s.style.transform = `translate3d(${-S}px, 0px, 0px)`), v < d ? this.wnd.requestAnimationFrame(g) : (this.clearTouches(), s.style.removeProperty("transform"), s.scrollLeft = u, t || this.reportProgress());
       };
       this.wnd.requestAnimationFrame(g);
     } else
       s.style.removeProperty("transform"), this.wnd.requestAnimationFrame(() => {
-        s.scrollLeft = d, this.clearTouches(), t || this.reportProgress();
+        s.scrollLeft = u, this.clearTouches(), t || this.reportProgress();
       });
   }
   dragOffset() {
@@ -2437,7 +2441,7 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
   onTouchMove(e) {
     if (this.touchState === 0)
       return;
-    this.touchState === 1 && (this.touchState = 2, T(this.wnd)), this.endingX = e.touches[0].clientX;
+    this.touchState === 1 && (this.touchState = 2, w(this.wnd)), this.endingX = e.touches[0].clientX;
     const t = this.dragOffset(), i = this.alreadyScrollLeft + t;
     i < 0 ? (this.overscroll = i, this.doc().style.transform = `translate3d(${-this.overscroll}px, 0px, 0px)`) : i + this.wnd.innerWidth > this.cachedScrollWidth ? (this.overscroll = i, this.doc().style.transform = `translate3d(${-i}px, 0px, 0px)`) : (this.overscroll = 0, this.doc().style.removeProperty("transform"), this.doc().scrollLeft = this.alreadyScrollLeft + t);
   }
@@ -2487,8 +2491,8 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
     }), this.resizeObserver.observe(e.document.body), this.mutationObserver = new MutationObserver((n) => {
       for (const o of n)
         if (o.target === this.wnd.document.documentElement) {
-          const a = o.oldValue, h = o.target.getAttribute("style"), c = /transform\s*:\s*([^;]+)/, d = a == null ? void 0 : a.match(c), p = h == null ? void 0 : h.match(c);
-          (!d && !p || d && !p || d && p && d[1] !== p[1]) && (e.requestAnimationFrame(() => {
+          const a = o.oldValue, c = o.target.getAttribute("style"), h = /transform\s*:\s*([^;]+)/, u = a == null ? void 0 : a.match(h), p = c == null ? void 0 : c.match(h);
+          (!u && !p || u && !p || u && p && u[1] !== p[1]) && (e.requestAnimationFrame(() => {
             e && Oe(e);
           }), this.onWidthChange());
         } else
@@ -2498,7 +2502,7 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
       const o = this.doc().scrollLeft;
       return this.doc().scrollLeft = this.snapOffset(n), o !== this.doc().scrollLeft;
     };
-    return e.addEventListener("orientationchange", this.onWidthChanger), e.addEventListener("resize", this.onWidthChanger), e.requestAnimationFrame(() => this.cachedScrollWidth = this.doc().scrollWidth), t.register("go_progression", w.moduleName, (n, o) => {
+    return e.addEventListener("orientationchange", this.onWidthChanger), e.addEventListener("resize", this.onWidthChanger), e.requestAnimationFrame(() => this.cachedScrollWidth = this.doc().scrollWidth), t.register("go_progression", T.moduleName, (n, o) => {
       const a = n;
       if (a < 0 || a > 1) {
         t.send("error", {
@@ -2508,74 +2512,74 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
       }
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const h = this.cachedScrollWidth, c = W(e) ? -1 : 1, d = h * a * c;
-        this.doc().scrollLeft = this.snapOffset(d), this.reportProgress(), T(this.wnd), o(!0);
+        const c = this.cachedScrollWidth, h = W(e) ? -1 : 1, u = c * a * h;
+        this.doc().scrollLeft = this.snapOffset(u), this.reportProgress(), w(this.wnd), o(!0);
       });
-    }), t.register("go_id", w.moduleName, (n, o) => {
+    }), t.register("go_id", T.moduleName, (n, o) => {
       const a = e.document.getElementById(n);
       if (!a) {
         o(!1);
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollLeft = this.snapOffset(a.getBoundingClientRect().left + e.scrollX), this.reportProgress(), T(this.wnd), o(!0);
+        this.doc().scrollLeft = this.snapOffset(a.getBoundingClientRect().left + e.scrollX), this.reportProgress(), w(this.wnd), o(!0);
       });
-    }), t.register("go_text", w.moduleName, (n, o) => {
+    }), t.register("go_text", T.moduleName, (n, o) => {
       let a;
       Array.isArray(n) && (n.length > 1 && (a = n[1]), n = n[0]);
-      const h = U.deserialize(n), c = le(this.wnd.document, new D({
+      const c = U.deserialize(n), h = le(this.wnd.document, new D({
         href: e.location.href,
         type: "text/html",
-        text: h,
+        text: c,
         locations: a ? new x({
           otherLocations: /* @__PURE__ */ new Map([
             ["cssSelector", a]
           ])
         }) : void 0
       }));
-      if (!c) {
+      if (!h) {
         o(!1);
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollLeft = this.snapOffset(c.getBoundingClientRect().left + e.scrollX), this.reportProgress(), T(this.wnd), o(!0);
+        this.doc().scrollLeft = this.snapOffset(h.getBoundingClientRect().left + e.scrollX), this.reportProgress(), w(this.wnd), o(!0);
       });
-    }), t.register("go_end", w.moduleName, (n, o) => {
+    }), t.register("go_end", T.moduleName, (n, o) => {
       const a = W(e) ? -1 : 1;
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const h = this.cachedScrollWidth * a;
-        if (this.doc().scrollLeft === h)
+        const c = this.cachedScrollWidth * a;
+        if (this.doc().scrollLeft === c)
           return o(!1);
-        this.doc().scrollLeft = this.snapOffset(h), this.reportProgress(), T(this.wnd), o(!0);
+        this.doc().scrollLeft = this.snapOffset(c), this.reportProgress(), w(this.wnd), o(!0);
       });
-    }), t.register("go_start", w.moduleName, (n, o) => {
+    }), t.register("go_start", T.moduleName, (n, o) => {
       this.wnd.requestAnimationFrame(() => {
         if (this.doc().scrollLeft === 0)
           return o(!1);
-        this.doc().scrollLeft = 0, this.reportProgress(), T(this.wnd), o(!0);
+        this.doc().scrollLeft = 0, this.reportProgress(), w(this.wnd), o(!0);
       });
-    }), t.register("go_prev", w.moduleName, (n, o) => {
+    }), t.register("go_prev", T.moduleName, (n, o) => {
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const a = e.scrollX - e.innerWidth, h = W(e) ? -(this.cachedScrollWidth - e.innerWidth) : 0, c = s(Math.max(a, h));
-        c && (this.reportProgress(), T(this.wnd)), o(c);
+        const a = e.scrollX - e.innerWidth, c = W(e) ? -(this.cachedScrollWidth - e.innerWidth) : 0, h = s(Math.max(a, c));
+        h && (this.reportProgress(), w(this.wnd)), o(h);
       });
-    }), t.register("go_next", w.moduleName, (n, o) => {
+    }), t.register("go_next", T.moduleName, (n, o) => {
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth;
-        const a = e.scrollX + e.innerWidth, h = W(e) ? 0 : this.cachedScrollWidth - e.innerWidth, c = s(Math.min(a, h));
-        c && (this.reportProgress(), T(this.wnd)), o(c);
+        const a = e.scrollX + e.innerWidth, c = W(e) ? 0 : this.cachedScrollWidth - e.innerWidth, h = s(Math.min(a, c));
+        h && (this.reportProgress(), w(this.wnd)), o(h);
       });
-    }), t.register("unfocus", w.moduleName, (n, o) => {
-      this.snappingCancelled = !0, T(this.wnd), o(!0);
-    }), t.register("shake", w.moduleName, (n, o) => {
+    }), t.register("unfocus", T.moduleName, (n, o) => {
+      this.snappingCancelled = !0, w(this.wnd), o(!0);
+    }), t.register("shake", T.moduleName, (n, o) => {
       this.shake(), o(!0);
-    }), t.register("focus", w.moduleName, (n, o) => {
+    }), t.register("focus", T.moduleName, (n, o) => {
       this.wnd.requestAnimationFrame(() => {
         this.cachedScrollWidth = this.doc().scrollWidth, this.snapCurrentOffset(!1, !0), this.reportProgress(), o(!0);
       });
-    }), t.register("first_visible_locator", w.moduleName, (n, o) => {
+    }), t.register("first_visible_locator", T.moduleName, (n, o) => {
       const a = Ke(e, !1);
       this.comms.send("first_visible_locator", a.serialize()), o(!0);
     }), e.addEventListener("touchstart", this.onTouchStarter, { passive: !0 }), e.addEventListener("touchend", this.onTouchEnder, { passive: !0 }), e.addEventListener("touchmove", this.onTouchMover, { passive: !0 }), e.document.addEventListener("touchstart", () => {
@@ -2583,7 +2587,7 @@ const Ie = "readium-column-snapper-style", Ht = 200, Je = class w extends Xe {
   }
   unmount(e, t) {
     var i;
-    return this.snappingCancelled = !0, t.unregisterAll(w.moduleName), this.resizeObserver.disconnect(), this.mutationObserver.disconnect(), e.removeEventListener("touchstart", this.onTouchStarter), e.removeEventListener("touchend", this.onTouchEnder), e.removeEventListener("touchmove", this.onTouchMover), e.removeEventListener("orientationchange", this.onWidthChanger), e.removeEventListener("resize", this.onWidthChanger), (i = e.document.getElementById(Ie)) == null || i.remove(), t.log("ColumnSnapper Unmounted"), super.unmount(e, t);
+    return this.snappingCancelled = !0, t.unregisterAll(T.moduleName), this.resizeObserver.disconnect(), this.mutationObserver.disconnect(), e.removeEventListener("touchstart", this.onTouchStarter), e.removeEventListener("touchend", this.onTouchEnder), e.removeEventListener("touchmove", this.onTouchMover), e.removeEventListener("orientationchange", this.onWidthChanger), e.removeEventListener("resize", this.onWidthChanger), (i = e.document.getElementById(Ie)) == null || i.remove(), t.log("ColumnSnapper Unmounted"), super.unmount(e, t);
   }
 };
 Je.moduleName = "column_snapper";
@@ -2627,7 +2631,7 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollTop = this.doc().offsetHeight * o, this.reportProgress({ progress: o, reference: this.wnd.innerHeight / this.doc().scrollHeight }), T(this.wnd), n(!0);
+        this.doc().scrollTop = this.doc().offsetHeight * o, this.reportProgress({ progress: o, reference: this.wnd.innerHeight / this.doc().scrollHeight }), w(this.wnd), n(!0);
       });
     }), t.register("go_id", A.moduleName, (s, n) => {
       const o = e.document.getElementById(s);
@@ -2638,12 +2642,12 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
       this.wnd.requestAnimationFrame(() => {
         this.doc().scrollTop = o.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2;
         const a = this.doc().scrollTop / this.doc().offsetHeight;
-        this.reportProgress({ progress: a, reference: this.wnd.innerHeight / this.doc().scrollHeight }), T(this.wnd), n(!0);
+        this.reportProgress({ progress: a, reference: this.wnd.innerHeight / this.doc().scrollHeight }), w(this.wnd), n(!0);
       });
     }), t.register("go_text", A.moduleName, (s, n) => {
       let o;
       Array.isArray(s) && (s.length > 1 && (o = s[1]), s = s[0]);
-      const a = U.deserialize(s), h = le(this.wnd.document, new D({
+      const a = U.deserialize(s), c = le(this.wnd.document, new D({
         href: e.location.href,
         type: "text/html",
         text: a,
@@ -2653,14 +2657,14 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
           ])
         }) : void 0
       }));
-      if (!h) {
+      if (!c) {
         n(!1);
         return;
       }
       this.wnd.requestAnimationFrame(() => {
-        this.doc().scrollTop = h.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2;
-        const c = this.doc().scrollTop / this.doc().offsetHeight;
-        this.reportProgress({ progress: c, reference: this.wnd.innerHeight / this.doc().scrollHeight }), T(this.wnd), n(!0);
+        this.doc().scrollTop = c.getBoundingClientRect().top + e.scrollY - e.innerHeight / 2;
+        const h = this.doc().scrollTop / this.doc().offsetHeight;
+        this.reportProgress({ progress: h, reference: this.wnd.innerHeight / this.doc().scrollHeight }), w(this.wnd), n(!0);
       });
     }), t.register("go_start", A.moduleName, (s, n) => {
       if (this.doc().scrollTop === 0)
@@ -2671,7 +2675,7 @@ const Le = "readium-scroll-snapper-style", Qe = class A extends Xe {
         return n(!1);
       this.doc().scrollTop = 0, this.reportProgress({ progress: 0, reference: this.wnd.innerHeight / this.doc().scrollHeight }), n(!0);
     }), t.register("unfocus", A.moduleName, (s, n) => {
-      T(this.wnd), n(!0);
+      w(this.wnd), n(!0);
     }), t.register([
       "go_next",
       "go_prev"
@@ -2695,18 +2699,18 @@ class et extends Y {
     super(...arguments), this.pointerMoved = !1, this.onPointerUp = this.onPointUp.bind(this), this.onPointerMove = this.onPointMove.bind(this), this.onPointerDown = this.onPointDown.bind(this), this.onContextMenu = this.onContext.bind(this), this.onClicker = this.onClick.bind(this);
   }
   onPointUp(e) {
-    var s, n, o, a, h;
+    var s, n, o, a, c;
     const t = this.wnd.getSelection();
     if (t && ((s = t.toString()) == null ? void 0 : s.length) > 0) {
-      const c = (n = t.getRangeAt(0)) == null ? void 0 : n.getClientRects();
-      if (!c || c.length === 0)
+      const h = (n = t.getRangeAt(0)) == null ? void 0 : n.getClientRects();
+      if (!h || h.length === 0)
         return;
-      const d = c[0], p = {
+      const u = h[0], p = {
         text: t.toString(),
-        x: d.x,
-        y: d.y,
-        width: d.width,
-        height: d.height,
+        x: u.x,
+        y: u.y,
+        width: u.width,
+        height: u.height,
         targetFrameSrc: (a = (o = this.wnd) == null ? void 0 : o.location) == null ? void 0 : a.href
       };
       this.comms.send("text_selected", p);
@@ -2724,7 +2728,7 @@ class et extends Y {
       y: e.clientY * i,
       targetFrameSrc: this.wnd.location.href,
       targetElement: e.target.outerHTML,
-      interactiveElement: (h = Ye(e.target)) == null ? void 0 : h.outerHTML,
+      interactiveElement: (c = Ye(e.target)) == null ? void 0 : c.outerHTML,
       cssSelector: this.wnd._readium_cssSelectorGenerator.getCssSelector(e.target)
     }), this.pointerMoved = !1;
   }
@@ -2815,7 +2819,7 @@ const tt = class te extends Y {
     ), Reflect.defineProperty(e.navigator, "epubReadingSystem", {
       value: {
         name: "readium-ts-toolkit",
-        version: "2.0.0-beta.1",
+        version: "2.0.0-beta.2",
         hasFeature: (s, n = "") => {
           switch (s) {
             case "dom-manipulation":
@@ -2879,7 +2883,7 @@ const Re = "readium-viewport", rt = class F extends it {
     ), e.document.head.appendChild(i), e.addEventListener("orientationchange", this.onViewportWidthChanged), e.addEventListener("resize", this.onViewportWidthChanged), this.onViewportWidthChanged({
       target: e
     }), t.register("get_properties", F.moduleName, (s, n) => {
-      qe(e), n(!0);
+      Ve(e), n(!0);
     }), t.register("update_properties", F.moduleName, (s, n) => {
       s["--RS__viewportWidth"] = `${e.innerWidth}px`, Nt(e, s), n(!0);
     }), t.register("set_property", F.moduleName, (s, n) => {
@@ -2897,7 +2901,7 @@ const Re = "readium-viewport", rt = class F extends it {
   }
 };
 rt.moduleName = "reflowable_setup";
-let qt = rt;
+let Vt = rt;
 const ze = "readium-fixed-style", st = class L extends it {
   mount(e, t) {
     if (!super.mount(e, t))
@@ -2922,7 +2926,7 @@ const ze = "readium-fixed-style", st = class L extends it {
     }), t.register("remove_property", L.moduleName, (s, n) => {
       he(e, s), n(!0);
     }), t.register("first_visible_locator", L.moduleName, (s, n) => n(!1)), t.register("unfocus", L.moduleName, (s, n) => {
-      T(e), n(!0);
+      w(e), n(!0);
     }), t.register([
       "focus",
       "go_next",
@@ -2942,7 +2946,7 @@ const ze = "readium-fixed-style", st = class L extends it {
   }
 };
 st.moduleName = "fixed_setup";
-let Vt = st;
+let qt = st;
 const _t = [
   "fixed_setup",
   "decorator",
@@ -2955,8 +2959,8 @@ const _t = [
   "scroll_snapper"
 ], De = new Map([
   // All modules go here
-  Vt,
   qt,
+  Vt,
   et,
   Dt,
   $t,