@prose-reader/core 1.194.0 → 1.195.0

package/dist/createReaderWithEnhancer.d.ts

@@ -138,20 +138,14 @@ export declare const createReaderWithEnhancers: (options: Partial<import('./sett
             theme$: import('rxjs').Observable<import('./enhancers/theme').Theme>;
         };
     };
+} & {
+    links$: ReturnType<typeof import('./enhancers/html/links').handleLinks>;
 }, "load"> & import('./enhancers/navigation/types').NavigationEnhancerOutput & import('./enhancers/zoom/types').ZoomEnhancerOutput, "settings"> & {
     settings: import('./settings/SettingsInterface').SettingsInterface<import('./settings/types').CoreInputSettings & import('./enhancers/layoutEnhancer/types').InputSettings, import('./enhancers/layoutEnhancer/types').InputSettings & import('./settings/types').CoreInputSettings & import('./settings/types').ComputedCoreSettings>;
 } & {
     utils: {
         isOrIsWithinValidLink: (target: Event[`target`]) => boolean;
     };
-} & {
-    $: {
-        links$: import('rxjs').Observable<{
-            event: `linkClicked`;
-            data: HTMLAnchorElement;
-            isNavigable: boolean;
-        }>;
-    };
 }, "settings"> & {
     settings: import('./settings/SettingsInterface').SettingsInterface<import('./settings/types').CoreInputSettings & import('./enhancers/layoutEnhancer/types').InputSettings & import('./enhancers/fonts/types').InputSettings, import('./enhancers/fonts/types').InputSettings & import('./enhancers/layoutEnhancer/types').InputSettings & import('./settings/types').CoreInputSettings & import('./settings/types').ComputedCoreSettings>;
 } & {

package/dist/enhancers/html/enhancer.d.ts

@@ -1,2 +1,8 @@
 import { EnhancerOptions, EnhancerOutput, RootEnhancer } from '../types/enhancer';
-export declare const htmlEnhancer: <InheritOptions extends EnhancerOptions<RootEnhancer>, InheritOutput extends EnhancerOutput<RootEnhancer>>(next: (options: InheritOptions) => InheritOutput) => (options: InheritOptions) => InheritOutput;
+import { handleLinks } from './links';
+export type HtmlEnhancerOutput = {
+    links$: ReturnType<typeof handleLinks>;
+};
+export declare const htmlEnhancer: <InheritOptions extends EnhancerOptions<RootEnhancer>, InheritOutput extends EnhancerOutput<RootEnhancer>>(next: (options: InheritOptions) => InheritOutput) => (options: InheritOptions) => InheritOutput & {
+    links$: ReturnType<typeof handleLinks>;
+};

package/dist/enhancers/html/links.d.ts

@@ -0,0 +1,2 @@
+import { Reader } from '../../reader';
+export declare const handleLinks: (reader: Reader) => import('rxjs').Observable<MouseEvent>;

package/dist/enhancers/navigation/index.d.ts

@@ -1,3 +1,4 @@
+import { HtmlEnhancerOutput } from '../html/enhancer';
 import { EnhancerOptions, EnhancerOutput, RootEnhancer } from '../types/enhancer';
 import { NavigationEnhancerOutput } from './types';
-export declare const navigationEnhancer: <InheritOptions extends EnhancerOptions<RootEnhancer>, InheritOutput extends EnhancerOutput<RootEnhancer>>(next: (options: InheritOptions) => InheritOutput) => (options: InheritOptions) => Omit<InheritOutput, "load"> & NavigationEnhancerOutput;
+export declare const navigationEnhancer: <InheritOptions extends EnhancerOptions<RootEnhancer>, InheritOutput extends EnhancerOutput<RootEnhancer> & HtmlEnhancerOutput>(next: (options: InheritOptions) => InheritOutput) => (options: InheritOptions) => Omit<InheritOutput, "load"> & NavigationEnhancerOutput;

package/dist/enhancers/navigation/links.d.ts

@@ -0,0 +1,4 @@
+import { Reader } from '../../reader';
+import { HtmlEnhancerOutput } from '../html/enhancer';
+import { ManualNavigator } from './navigators/manualNavigator';
+export declare const handleLinksNavigation: (reader: Reader & HtmlEnhancerOutput, manualNavigator: ManualNavigator) => import('rxjs').Observable<MouseEvent>;

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export { SettingsManager } from './settings/SettingsManager';
 export type Reader = ReturnType<typeof createReader>;
 export { createReader };
 export { Report } from './report';
-export { isHtmlElement } from './utils/dom';
+export { isHtmlElement, isHtmlTagElement } from './utils/dom';
 export { isShallowEqual } from './utils/objects';
 export { waitForSwitch } from './utils/rxjs';
 export { SpineItem } from './spineItem/SpineItem';

package/dist/index.js

@@ -1,4 +1,4 @@
-import { switchMap, of, fromEvent, take, map, from, takeUntil, Observable, defer, Subject, combineLatest, merge, EMPTY, withLatestFrom, BehaviorSubject, filter, share, first as first$1, mergeMap, endWith, tap as tap$1, finalize, catchError, lastValueFrom, NEVER, scheduled, animationFrameScheduler, distinctUntilChanged as distinctUntilChanged$1, throttleTime, debounceTime as debounceTime$1, startWith as startWith$1, switchScan, forkJoin, shareReplay as shareReplay$1, delay, ReplaySubject, identity, timer, skip as skip$1, exhaustMap, reduce, concatMap } from "rxjs";
+import { switchMap, of, fromEvent, take, map, from, takeUntil, Observable, defer, Subject, combineLatest, merge, EMPTY, withLatestFrom, NEVER, tap as tap$1, share, BehaviorSubject, filter, first as first$1, mergeMap, endWith, finalize, catchError, lastValueFrom, scheduled, animationFrameScheduler, distinctUntilChanged as distinctUntilChanged$1, throttleTime, debounceTime as debounceTime$1, startWith as startWith$1, switchScan, forkJoin, shareReplay as shareReplay$1, delay, ReplaySubject, identity, timer, skip as skip$1, exhaustMap, reduce, concatMap } from "rxjs";
 import { switchMap as switchMap$1, first, map as map$1, startWith, shareReplay, distinctUntilChanged, tap, pairwise, take as take$1, takeUntil as takeUntil$1, filter as filter$1, debounceTime, skip, mergeMap as mergeMap$1, catchError as catchError$1, withLatestFrom as withLatestFrom$1 } from "rxjs/operators";
 import { shallowMergeIfDefined, isShallowEqual, getParentPath, parseContentType, detectMimeTypeFromName, arrayEqual } from "@prose-reader/shared";
 import { isShallowEqual as isShallowEqual2 } from "@prose-reader/shared";
@@ -458,6 +458,9 @@ const revokeDocumentBlobs = (_document) => {
     }
   }
 };
+function isHtmlTagElement(element, tagName) {
+  return isHtmlElement(element) && element.tagName.toLowerCase() === tagName.toLowerCase();
+}
 const translateFramePositionIntoPage = ({
   position,
   frameElement
@@ -885,6 +888,33 @@ const hotkeysEnhancer = (next) => (options) => {
   ).subscribe();
   return reader;
 };
+const handleLinks = (reader) => {
+  return reader.spine.spineItemsManager.items$.pipe(
+    switchMap(
+      (items) => merge(
+        ...items.map((item) => {
+          return item.loaded$.pipe(
+            switchMap(() => {
+              const frame = item.renderer.getDocumentFrame();
+              if (!frame || !(frame == null ? void 0 : frame.contentDocument)) return NEVER;
+              const anchorElements = Array.from(
+                frame.contentDocument.querySelectorAll(`a`)
+              );
+              const events$ = anchorElements.map(
+                (element) => fromEvent(element, `click`)
+              );
+              return merge(...events$);
+            })
+          );
+        })
+      )
+    ),
+    tap$1((event) => {
+      event.preventDefault();
+    }),
+    share()
+  );
+};
 class DestroyableClass {
   constructor() {
     this.isDestroyed = false;
@@ -1997,7 +2027,12 @@ const htmlEnhancer = (next) => (options) => {
       return maybeFactory ?? ((props) => new HtmlRenderer(props));
     }
   });
-  return reader;
+  const links$ = handleLinks(reader);
+  links$.pipe(takeUntil(reader.$.destroy$)).subscribe();
+  return {
+    ...reader,
+    links$
+  };
 };
 function isDefined(arg) {
   return arg !== null && arg !== void 0;
@@ -2255,52 +2290,6 @@ const layoutEnhancer = (next) => (options) => {
     settings: settingsManager
   };
 };
-const linksEnhancer = (next) => (options) => {
-  const reader = next(options);
-  const subject = new 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 @@ const mediaEnhancer = (next) => (options) => {
     destroy
   };
 };
+const handleLinksNavigation = (reader, manualNavigator) => {
+  return reader.links$.pipe(
+    tap$1((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 @@ const navigationEnhancer = (next) => (options) => {
       manualNavigator.goToCfi(cfi, { animate: false });
     }
   };
+  const linksNavigation$ = handleLinksNavigation(reader, manualNavigator);
+  linksNavigation$.pipe(takeUntil(reader.$.destroy$)).subscribe();
   return {
     ...reader,
     load,
@@ -8934,22 +8941,20 @@ const createReaderWithEnhancers = (
       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
                                   )
                                 )
                               )
@@ -8984,6 +8989,7 @@ export {
   idle,
   injectCSS,
   isHtmlElement,
+  isHtmlTagElement,
   isShallowEqual2 as isShallowEqual,
   mapKeysTo,
   observeMutation,