@prose-reader/core 1.162.0 → 1.164.0

package/dist/enhancers/html/renderer/{medias.d.ts → assets.d.ts}

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs';
 import { ReaderSettingsManager } from '../../../settings/ReaderSettingsManager';
 import { Manifest } from '@prose-reader/shared';
 import { Context } from '../../../context/Context';
-export declare const loadMedias: ({ settings, item, context, }: {
+export declare const loadAssets: ({ settings, item, context, }: {
     settings: ReaderSettingsManager;
     item: Manifest["items"][number];
     context: Context;

package/dist/index.js

@@ -5567,7 +5567,7 @@ class DocumentRenderer extends DestroyableClass {
         if (this.renditionLayout === `pre-paginated`) {
           this.lastLayoutDims = {
             height: this.context.getPageSize().height,
-            width: this.context.getPageSize().width
+            width: params.minimumWidth
           };
         } else {
           this.lastLayoutDims = {
@@ -6804,9 +6804,8 @@ const createReader = (inputSettings) => {
     const margin = 0;
     const marginTop = 0;
     const marginBottom = 0;
-    const isReflow = true;
     const containerElementWidth = dimensions.width;
-    const containerElementEvenWidth = containerElementWidth % 2 === 0 || isReflow ? containerElementWidth : containerElementWidth - 1;
+    const containerElementEvenWidth = containerElementWidth;
     element.style.setProperty(`overflow`, `hidden`);
     element.style.height = `${dimensions.height - marginTop - marginBottom}px`;
     element.style.width = `${containerElementEvenWidth - 2 * margin}px`;
@@ -8358,21 +8357,46 @@ const renderReflowable = ({
     latestContentHeightWhenLoaded: newLatestContentHeightWhenLoaded
   };
 };
-const loadMedias = ({
+const joinPath = (base, path) => {
+  const isFileProtocol = base.startsWith("file://");
+  const tempBase = isFileProtocol ? base.replace("file://", "http://") : base;
+  const result = new URL(path, tempBase).toString();
+  return isFileProtocol ? result.replace("http://", "file://") : result;
+};
+const getElementsWithAssets = (document2) => {
+  const RESOURCE_ELEMENTS = [
+    "img",
+    // Images
+    "video",
+    // Video files
+    "audio",
+    // Audio files
+    "source",
+    // Source elements within video/audio
+    "link",
+    // Stylesheets and other linked resources
+    "script"
+    // JavaScript files
+  ].join(",");
+  return Array.from((document2 == null ? void 0 : document2.querySelectorAll(RESOURCE_ELEMENTS)) || []);
+};
+const loadAssets = ({
   settings,
   item,
   context
 }) => (stream) => stream.pipe(
   switchMap$1((frameElement) => {
-    var _a;
-    const images = ((_a = frameElement.contentDocument) == null ? void 0 : _a.getElementsByTagName("img")) || [];
-    const imageObservables = Array.from(images).map((img) => {
-      var _a2;
-      const originalSrc = img.getAttribute("src");
+    const elementsWithAsset = getElementsWithAssets(
+      frameElement.contentDocument
+    );
+    const assetsLoad$ = Array.from(elementsWithAsset).map((element) => {
+      var _a;
+      const originalSrc = element.getAttribute("src") || element.getAttribute("href");
+      if (!originalSrc) return of(null);
       const spineItemUriParentPath = getParentPath(item.href);
-      const foundItem = (_a2 = context.manifest) == null ? void 0 : _a2.items.find(({ href }) => {
-        return `${spineItemUriParentPath}/${originalSrc}`.endsWith(
-          `${href}`
+      const foundItem = (_a = context.manifest) == null ? void 0 : _a.items.find(({ href }) => {
+        return `${joinPath(spineItemUriParentPath, originalSrc).toLowerCase()}`.endsWith(
+          `${href.toLowerCase()}`
         );
       });
       if (!foundItem) return of(null);
@@ -8384,22 +8408,24 @@ const loadMedias = ({
         tap$1((blob) => {
           if (blob) {
             const blobUrl = URL.createObjectURL(blob);
-            img.src = blobUrl;
+            if (element.hasAttribute("src")) {
+              element.setAttribute("src", blobUrl);
+            } else if (element.hasAttribute("href")) {
+              element.setAttribute("href", blobUrl);
+            }
           }
         })
       );
     });
-    return combineLatest(imageObservables).pipe(map$1(() => frameElement));
+    return combineLatest(assetsLoad$).pipe(map$1(() => frameElement));
   })
 );
 const unloadMedias = (frameElement) => {
-  var _a;
-  const images = Array.from(
-    ((_a = frameElement == null ? void 0 : frameElement.contentDocument) == null ? void 0 : _a.getElementsByTagName("img")) || []
-  );
-  images.forEach((img) => {
-    if (img.src.startsWith("blob:")) {
-      URL.revokeObjectURL(img.src);
+  const elementsWithAsset = getElementsWithAssets(frameElement == null ? void 0 : frameElement.contentDocument);
+  elementsWithAsset.forEach((element) => {
+    const url = element.getAttribute("src") || element.getAttribute("href");
+    if (url == null ? void 0 : url.startsWith("blob:")) {
+      URL.revokeObjectURL(url);
     }
   });
 };
@@ -8434,7 +8460,7 @@ class HtmlRenderer extends DocumentRenderer {
         this.containerElement.appendChild(frameElement2);
       }),
       waitForFrameLoad,
-      loadMedias({
+      loadAssets({
         context: this.context,
         item: this.item,
         settings: this.settings