@prose-reader/core 1.194.0 → 1.195.0

package/dist/index.umd.cjs

@@ -458,6 +458,9 @@
       }
     }
   };
+  function isHtmlTagElement(element, tagName) {
+    return isHtmlElement(element) && element.tagName.toLowerCase() === tagName.toLowerCase();
+  }
   const translateFramePositionIntoPage = ({
     position,
     frameElement
@@ -885,6 +888,33 @@
     ).subscribe();
     return reader;
   };
+  const handleLinks = (reader) => {
+    return reader.spine.spineItemsManager.items$.pipe(
+      rxjs.switchMap(
+        (items) => rxjs.merge(
+          ...items.map((item) => {
+            return item.loaded$.pipe(
+              rxjs.switchMap(() => {
+                const frame = item.renderer.getDocumentFrame();
+                if (!frame || !(frame == null ? void 0 : frame.contentDocument)) return rxjs.NEVER;
+                const anchorElements = Array.from(
+                  frame.contentDocument.querySelectorAll(`a`)
+                );
+                const events$ = anchorElements.map(
+                  (element) => rxjs.fromEvent(element, `click`)
+                );
+                return rxjs.merge(...events$);
+              })
+            );
+          })
+        )
+      ),
+      rxjs.tap((event) => {
+        event.preventDefault();
+      }),
+      rxjs.share()
+    );
+  };
   class DestroyableClass {
     constructor() {
       this.isDestroyed = false;
@@ -1997,7 +2027,12 @@
         return maybeFactory ?? ((props) => new HtmlRenderer(props));
       }
     });
-    return reader;
+    const links$ = handleLinks(reader);
+    links$.pipe(rxjs.takeUntil(reader.$.destroy$)).subscribe();
+    return {
+      ...reader,
+      links$
+    };
   };
   function isDefined(arg) {
     return arg !== null && arg !== void 0;
@@ -2255,52 +2290,6 @@
       settings: settingsManager
     };
   };
-  const linksEnhancer = (next) => (options) => {
-    const reader = next(options);
-    const subject = new rxjs.Subject();
-    const handleNavigationForClick = (element) => {
-      var _a;
-      if (!element.href) return false;
-      const hrefUrl = new URL(element.href);
-      const hrefWithoutAnchor = `${hrefUrl.origin}${hrefUrl.pathname}`;
-      const hasExistingSpineItem = (_a = reader.context.manifest) == null ? void 0 : _a.spineItems.some(
-        (item) => item.href === hrefWithoutAnchor
-      );
-      if (hasExistingSpineItem) {
-        reader.navigation.goToUrl(hrefUrl);
-        return true;
-      }
-      return false;
-    };
-    reader.hookManager.register(`item.onDocumentLoad`, ({ itemId }) => {
-      const item = reader.spineItemsManager.get(itemId);
-      const frame = item == null ? void 0 : item.renderer.getDocumentFrame();
-      if (!frame) return;
-      if (frame == null ? void 0 : frame.contentDocument) {
-        Array.from(frame.contentDocument.querySelectorAll(`a`)).forEach(
-          (element) => element.addEventListener(`click`, (e) => {
-            if (e.target && `style` in e.target && `ELEMENT_NODE` in e.target) {
-              Report.warn(`prevented click on`, element, e);
-              e.preventDefault();
-              const isNavigable = handleNavigationForClick(element);
-              subject.next({
-                event: `linkClicked`,
-                data: element,
-                isNavigable
-              });
-            }
-          })
-        );
-      }
-    });
-    return {
-      ...reader,
-      $: {
-        ...reader.$,
-        links$: subject.asObservable()
-      }
-    };
-  };
   const HTML_PREFIX = `${HTML_PREFIX$1}-enhancer-loading`;
   const CONTAINER_HTML_PREFIX = `${HTML_PREFIX}-container`;
   const createLoadingElementContainer = (containerElement, context) => {
@@ -2588,6 +2577,22 @@
       destroy
     };
   };
+  const handleLinksNavigation = (reader, manualNavigator) => {
+    return reader.links$.pipe(
+      rxjs.tap((event) => {
+        var _a;
+        if (!isHtmlTagElement(event.target, "a") || event.type !== "click") return;
+        const hrefUrl = new URL(event.target.href);
+        const hrefWithoutAnchor = `${hrefUrl.origin}${hrefUrl.pathname}`;
+        const hasExistingSpineItem = (_a = reader.context.manifest) == null ? void 0 : _a.spineItems.some(
+          (item) => item.href === hrefWithoutAnchor
+        );
+        if (hasExistingSpineItem) {
+          manualNavigator.goToUrl(hrefUrl);
+        }
+      })
+    );
+  };
   const report$4 = Report.namespace(`navigation`);
   const getSpineItemPositionForLeftPage = ({
     position,
@@ -3121,6 +3126,8 @@
         manualNavigator.goToCfi(cfi, { animate: false });
       }
     };
+    const linksNavigation$ = handleLinksNavigation(reader, manualNavigator);
+    linksNavigation$.pipe(rxjs.takeUntil(reader.$.destroy$)).subscribe();
     return {
       ...reader,
       load,
@@ -8934,22 +8941,20 @@
         loadingEnhancer(
           webkitEnhancer(
             fontsEnhancer(
-              linksEnhancer(
-                accessibilityEnhancer(
-                  resourcesEnhancer(
-                    utilsEnhancer(
-                      layoutEnhancer(
-                        zoomEnhancer(
-                          mediaEnhancer(
-                            chromeEnhancer(
-                              navigationEnhancer(
+              accessibilityEnhancer(
+                resourcesEnhancer(
+                  utilsEnhancer(
+                    layoutEnhancer(
+                      zoomEnhancer(
+                        navigationEnhancer(
+                          htmlEnhancer(
+                            mediaEnhancer(
+                              chromeEnhancer(
                                 themeEnhancer(
                                   paginationEnhancer(
                                     eventsEnhancer(
-                                      htmlEnhancer(
-                                        // __
-                                        createReader
-                                      )
+                                      // __
+                                      createReader
                                     )
                                   )
                                 )
@@ -8987,6 +8992,7 @@
   exports2.idle = idle;
   exports2.injectCSS = injectCSS;
   exports2.isHtmlElement = isHtmlElement;
+  exports2.isHtmlTagElement = isHtmlTagElement;
   exports2.mapKeysTo = mapKeysTo;
   exports2.observeMutation = observeMutation;
   exports2.observeResize = observeResize;