@prose-reader/core 1.141.0 → 1.143.0

package/dist/context/Context.d.ts

@@ -8,7 +8,6 @@ export type ContextState = {
     isUsingSpreadMode?: boolean;
     isFullyPrePaginated?: boolean;
     forceSinglePageMode?: boolean;
-    areAllItemsPrePaginated?: boolean;
     calculatedInnerMargin: number;
     marginTop: number;
     marginBottom: number;

package/dist/enhancers/media/ImageRenderer.d.ts

@@ -8,7 +8,7 @@ export declare class ImageRenderer extends DocumentRenderer {
         minPageSpread: number;
         blankPagePosition: `before` | `after` | `none`;
         spreadPosition: `none` | `left` | `right`;
-    }): import('rxjs').Observable<{
+    }): import('rxjs').Observable<undefined> | import('rxjs').Observable<{
         width: number;
         height: number;
     }>;

package/dist/index.js

@@ -250,12 +250,14 @@ const getFrameViewportInfo = (frame) => {
   return { hasViewport: false };
 };
 const waitForFrameLoad = (stream) => stream.pipe(
-  switchMap$1(
-    (frame) => fromEvent(frame, `load`).pipe(
+  switchMap$1((frame) => {
+    var _a;
+    if (((_a = frame.contentDocument) == null ? void 0 : _a.readyState) === "complete") return of(frame);
+    return fromEvent(frame, `load`).pipe(
       take(1),
       map$1(() => frame)
-    )
-  )
+    );
+  })
 );
 const waitForFrameReady = (stream) => stream.pipe(
   switchMap$1(
@@ -1936,7 +1938,6 @@ const isUsingSpreadMode = ({
   return isLandscape && ((manifest == null ? void 0 : manifest.renditionSpread) === void 0 || (manifest == null ? void 0 : manifest.renditionSpread) === `auto` || (manifest == null ? void 0 : manifest.renditionSpread) === `landscape` || (manifest == null ? void 0 : manifest.renditionSpread) === `both`);
 };
 const isFullyPrePaginated = (manifest) => (manifest == null ? void 0 : manifest.renditionLayout) === "pre-paginated" || (manifest == null ? void 0 : manifest.spineItems.every((item) => item.renditionLayout === "pre-paginated"));
-const areAllItemsPrePaginated = (manifest) => !(manifest == null ? void 0 : manifest.spineItems.some((item) => item.renditionLayout === `reflowable`));
 class BridgeEvent {
   constructor() {
     this.navigationSubject = new ReplaySubject(1);
@@ -2021,7 +2022,6 @@ class Context {
         height: newState.visibleAreaRect.height - marginTop - marginBottom
       },
       ...newState.manifest && {
-        areAllItemsPrePaginated: areAllItemsPrePaginated(manifest),
         isFullyPrePaginated: isFullyPrePaginated(manifest)
       },
       isUsingSpreadMode: isUsingSpreadMode({
@@ -4076,28 +4076,21 @@ class UserNavigator extends DestroyableClass {
     this.navigation$ = this.navigationSubject.asObservable();
     const userScroll$ = element$.pipe(
       switchMap$1(
-        (element) => settings.values$.pipe(
-          map$1(({ computedPageTurnMode }) => computedPageTurnMode),
-          distinctUntilChanged$1(),
-          filter$1(
-            (computedPageTurnMode) => computedPageTurnMode === "scrollable"
-          ),
-          switchMap$1(() => {
-            return fromEvent(element, `scroll`).pipe(
+        (element) => settings.watch(["computedPageTurnMode"]).pipe(
+          switchMap$1(
+            ({ computedPageTurnMode }) => computedPageTurnMode === "controlled" ? NEVER : fromEvent(element, `scroll`).pipe(
               withLatestFrom(scrollHappeningFromBrowser$),
-              filter$1(([, shouldAvoidScrollEvent]) => !shouldAvoidScrollEvent),
+              filter$1(
+                ([, shouldAvoidScrollEvent]) => !shouldAvoidScrollEvent
+              ),
               map$1(([event]) => event)
-            );
-          })
+            )
+          )
         )
       ),
       share()
     );
-    const navigateOnScroll$ = settings.values$.pipe(
-      map$1(({ computedPageTurnMode }) => computedPageTurnMode),
-      distinctUntilChanged$1(),
-      filter$1((computedPageTurnMode) => computedPageTurnMode === "scrollable"),
-      switchMap$1(() => userScroll$),
+    const navigateOnScroll$ = userScroll$.pipe(
       exhaustMap((event) => {
         const unlock = this.locker.lock();
         return merge(userScroll$, of(event)).pipe(
@@ -4264,20 +4257,8 @@ const restoreNavigationForScrollingPageTurnMode = ({
         });
       }
       if (!isPositionWithinSpineItem) {
-        if (navigation.directionFromLastNavigation === "backward") {
-          const positionInItem = {
-            y: height - positionYfromBottomPreviousNavigation,
-            x: navigation.position.x
-          };
-          return spineLocator.getSpinePositionFromSpineItemPosition({
-            spineItemPosition: spineLocator.getSafeSpineItemPositionFromUnsafeSpineItemPosition(
-              positionInItem,
-              foundSpineItem
-            ),
-            spineItem: foundSpineItem
-          });
-        }
-        if (navigation.directionFromLastNavigation === "forward" || navigation.directionFromLastNavigation === "anchor") {
+        const positionIsBeforeItem = navigation.position.y < top;
+        if (!positionIsBeforeItem) {
           const positionInItem = {
             y: height - positionYfromBottomPreviousNavigation,
             x: navigation.position.x
@@ -4973,11 +4954,17 @@ const createNavigator = ({
     spine
   );
   const isSpineScrolling$ = merge(
-    spine.elementResize$,
+    spine.element$.pipe(switchMap((element) => observeResize(element))),
     spine.element$.pipe(switchMap((element) => fromEvent(element, "scroll"))),
     spine.spineItemsObserver.itemResize$
   ).pipe(
-    switchMap(() => merge(of(true), timer(5).pipe(map(() => false)))),
+    switchMap(
+      () => timer(10).pipe(
+        map(() => false),
+        startWith(true)
+      )
+    ),
+    distinctUntilChanged(),
     startWith(false)
   );
   const scrollHappeningFromBrowser$ = combineLatest([
@@ -5135,20 +5122,13 @@ class ReaderSettingsManager extends SettingsManager3 {
     const computedSettings = {
       computedPageTurnDirection: settings.pageTurnDirection,
       computedPageTurnAnimation: settings.pageTurnAnimation,
-      computedPageTurnMode: `controlled`,
+      computedPageTurnMode: settings.pageTurnMode,
       computedPageTurnAnimationDuration: 0
     };
     if ((manifest == null ? void 0 : manifest.renditionFlow) === `scrolled-continuous`) {
       computedSettings.computedPageTurnMode = `scrollable`;
-      computedSettings.computedPageTurnDirection = `vertical`;
-    } else if (manifest && settings.pageTurnMode === `scrollable` && (manifest.renditionLayout !== `pre-paginated` || !areAllItemsPrePaginated(manifest))) {
-      Report.warn(
-        `pageTurnMode ${settings.pageTurnMode} incompatible with current book, switching back to default`
-      );
-      computedSettings.computedPageTurnAnimation = `none`;
-      computedSettings.computedPageTurnMode = `controlled`;
-    } else if (settings.pageTurnMode === `scrollable`) {
-      computedSettings.computedPageTurnMode = `scrollable`;
+    }
+    if (computedSettings.computedPageTurnMode === "scrollable") {
       computedSettings.computedPageTurnDirection = `vertical`;
     }
     if (hasVerticalWriting && computedSettings.computedPageTurnAnimation === `slide`) {
@@ -6670,10 +6650,6 @@ class Spine extends DestroyableClass {
     this.settings = settings;
     this.hookManager = hookManager;
     this.elementSubject = new BehaviorSubject(noopElement());
-    this.elementResize$ = this.elementSubject.pipe(
-      switchMap((element) => observeResize(element)),
-      share$1()
-    );
     this.element$ = this.elementSubject.asObservable();
     this.spineLayout = new SpineLayout(spineItemsManager, context, settings);
     this.locator = createSpineLocator({
@@ -6867,7 +6843,7 @@ const createReader = (inputSettings) => {
       }) => {
         return {
           ...stateSubject$.value,
-          supportedPageTurnMode: renditionFlow === `scrolled-continuous` ? [`scrollable`] : !context.state.areAllItemsPrePaginated ? [`controlled`] : [`controlled`, `scrollable`],
+          supportedPageTurnMode: renditionFlow === `scrolled-continuous` ? [`scrollable`] : [`controlled`, `scrollable`],
           supportedPageTurnAnimation: renditionFlow === `scrolled-continuous` || computedPageTurnMode === `scrollable` ? [`none`] : hasVerticalWriting ? [`fade`, `none`] : [`fade`, `none`, `slide`],
           supportedPageTurnDirection: computedPageTurnMode === `scrollable` ? [`vertical`] : renditionLayout === `reflowable` ? [`horizontal`] : [`horizontal`, `vertical`]
         };
@@ -7218,23 +7194,20 @@ class ImageRenderer extends DocumentRenderer {
   onLayout({
     spreadPosition
   }) {
-    var _a, _b;
     const element = this.getImageElement();
-    const continuousScrollableReflowableItem = ((_a = this.context.manifest) == null ? void 0 : _a.renditionLayout) === "reflowable" && ((_b = this.context.manifest) == null ? void 0 : _b.renditionFlow) === "scrolled-continuous";
     const { height: pageHeight, width: pageWidth } = this.context.getPageSize();
     let height = pageHeight;
     const width = pageWidth;
-    if (element) {
-      const naturalWidth = element.naturalWidth;
-      const naturalHeight = element.naturalHeight;
-      const ratio = naturalWidth / naturalHeight;
-      if (continuousScrollableReflowableItem) {
-        height = pageWidth / ratio;
-      }
-      element.style.height = `${height}px`;
-      element.style.width = `${width}px`;
-      element.style.objectPosition = spreadPosition === "left" ? `right` : spreadPosition === `right` ? `left` : `center`;
-    }
+    if (!element) return of(void 0);
+    const naturalWidth = element.naturalWidth || 1;
+    const naturalHeight = element.naturalHeight || 1;
+    const ratio = naturalWidth / naturalHeight;
+    if (this.settings.values.computedPageTurnDirection === "vertical" && this.settings.values.computedPageTurnMode === "scrollable" && !this.context.state.isUsingSpreadMode) {
+      height = Math.ceil(pageWidth / ratio);
+    }
+    element.style.height = `${height}px`;
+    element.style.width = `${width}px`;
+    element.style.objectPosition = spreadPosition === "left" ? `right` : spreadPosition === `right` ? `left` : `center`;
     return of({
       width,
       height
@@ -7512,6 +7485,7 @@ const loadingEnhancer = (next) => (options) => {
   const reader = next(options);
   const createEntries$ = (items) => of(
     items.reduce((acc, { item, element }) => {
+      element.style.zIndex = `0`;
       const alreadyExistingElement = element.querySelector(
         `.${CONTAINER_HTML_PREFIX}`
       );
@@ -8740,16 +8714,14 @@ const selectionEnhancer = (next) => (options) => {
       });
       return merge(...instances);
     }),
+    startWith$1(void 0),
     distinctUntilChanged$1(),
     tap$1((value) => {
       lasSelection = value;
     }),
     shareReplay$1({ refCount: true, bufferSize: 1 })
   );
-  const selection$ = trackedSelection$.pipe(
-    filter$1((selection) => (selection == null ? void 0 : selection.type) === "change" || !selection),
-    share()
-  );
+  const selection$ = trackedSelection$;
   const selectionStart$ = trackedSelection$.pipe(
     map$1((selection) => !!selection),
     distinctUntilChanged$1(),
@@ -8771,9 +8743,9 @@ const selectionEnhancer = (next) => (options) => {
     withLatestFrom(selection$),
     map$1(([, selection]) => selection),
     startWith$1(void 0),
-    shareReplay$1(1)
+    shareReplay$1({ refCount: true, bufferSize: 1 })
   );
-  selection$.pipe(takeUntil(reader.$.destroy$)).subscribe();
+  merge(selection$, lastSelectionOnPointerdown$).pipe(takeUntil(reader.$.destroy$)).subscribe();
   return {
     ...reader,
     selection: {