@prose-reader/core 1.141.0 → 1.143.0

package/dist/index.umd.cjs

@@ -250,12 +250,14 @@
     return { hasViewport: false };
   };
   const waitForFrameLoad = (stream) => stream.pipe(
-    rxjs.switchMap(
-      (frame) => rxjs.fromEvent(frame, `load`).pipe(
+    rxjs.switchMap((frame) => {
+      var _a;
+      if (((_a = frame.contentDocument) == null ? void 0 : _a.readyState) === "complete") return rxjs.of(frame);
+      return rxjs.fromEvent(frame, `load`).pipe(
         rxjs.take(1),
         rxjs.map(() => frame)
-      )
-    )
+      );
+    })
   );
   const waitForFrameReady = (stream) => stream.pipe(
     rxjs.switchMap(
@@ -1936,7 +1938,6 @@
     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 rxjs.ReplaySubject(1);
@@ -2021,7 +2022,6 @@
           height: newState.visibleAreaRect.height - marginTop - marginBottom
         },
         ...newState.manifest && {
-          areAllItemsPrePaginated: areAllItemsPrePaginated(manifest),
           isFullyPrePaginated: isFullyPrePaginated(manifest)
         },
         isUsingSpreadMode: isUsingSpreadMode({
@@ -4076,28 +4076,21 @@
       this.navigation$ = this.navigationSubject.asObservable();
       const userScroll$ = element$.pipe(
         rxjs.switchMap(
-          (element) => settings.values$.pipe(
-            rxjs.map(({ computedPageTurnMode }) => computedPageTurnMode),
-            rxjs.distinctUntilChanged(),
-            rxjs.filter(
-              (computedPageTurnMode) => computedPageTurnMode === "scrollable"
-            ),
-            rxjs.switchMap(() => {
-              return rxjs.fromEvent(element, `scroll`).pipe(
+          (element) => settings.watch(["computedPageTurnMode"]).pipe(
+            rxjs.switchMap(
+              ({ computedPageTurnMode }) => computedPageTurnMode === "controlled" ? rxjs.NEVER : rxjs.fromEvent(element, `scroll`).pipe(
                 rxjs.withLatestFrom(scrollHappeningFromBrowser$),
-                rxjs.filter(([, shouldAvoidScrollEvent]) => !shouldAvoidScrollEvent),
+                rxjs.filter(
+                  ([, shouldAvoidScrollEvent]) => !shouldAvoidScrollEvent
+                ),
                 rxjs.map(([event]) => event)
-              );
-            })
+              )
+            )
           )
         ),
         rxjs.share()
       );
-      const navigateOnScroll$ = settings.values$.pipe(
-        rxjs.map(({ computedPageTurnMode }) => computedPageTurnMode),
-        rxjs.distinctUntilChanged(),
-        rxjs.filter((computedPageTurnMode) => computedPageTurnMode === "scrollable"),
-        rxjs.switchMap(() => userScroll$),
+      const navigateOnScroll$ = userScroll$.pipe(
         rxjs.exhaustMap((event) => {
           const unlock = this.locker.lock();
           return rxjs.merge(userScroll$, rxjs.of(event)).pipe(
@@ -4264,20 +4257,8 @@
           });
         }
         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 @@
       spine
     );
     const isSpineScrolling$ = rxjs.merge(
-      spine.elementResize$,
+      spine.element$.pipe(operators.switchMap((element) => observeResize(element))),
       spine.element$.pipe(operators.switchMap((element) => rxjs.fromEvent(element, "scroll"))),
       spine.spineItemsObserver.itemResize$
     ).pipe(
-      operators.switchMap(() => rxjs.merge(rxjs.of(true), rxjs.timer(5).pipe(operators.map(() => false)))),
+      operators.switchMap(
+        () => rxjs.timer(10).pipe(
+          operators.map(() => false),
+          operators.startWith(true)
+        )
+      ),
+      operators.distinctUntilChanged(),
       operators.startWith(false)
     );
     const scrollHappeningFromBrowser$ = rxjs.combineLatest([
@@ -5135,20 +5122,13 @@
       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 @@
       this.settings = settings;
       this.hookManager = hookManager;
       this.elementSubject = new rxjs.BehaviorSubject(noopElement());
-      this.elementResize$ = this.elementSubject.pipe(
-        operators.switchMap((element) => observeResize(element)),
-        operators.share()
-      );
       this.element$ = this.elementSubject.asObservable();
       this.spineLayout = new SpineLayout(spineItemsManager, context, settings);
       this.locator = createSpineLocator({
@@ -6867,7 +6843,7 @@
         }) => {
           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 @@
     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 rxjs.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 rxjs.of({
         width,
         height
@@ -7512,6 +7485,7 @@
     const reader = next(options);
     const createEntries$ = (items) => rxjs.of(
       items.reduce((acc, { item, element }) => {
+        element.style.zIndex = `0`;
         const alreadyExistingElement = element.querySelector(
           `.${CONTAINER_HTML_PREFIX}`
         );
@@ -8740,16 +8714,14 @@
         });
         return rxjs.merge(...instances);
       }),
+      rxjs.startWith(void 0),
       rxjs.distinctUntilChanged(),
       rxjs.tap((value) => {
         lasSelection = value;
       }),
       rxjs.shareReplay({ refCount: true, bufferSize: 1 })
     );
-    const selection$ = trackedSelection$.pipe(
-      rxjs.filter((selection) => (selection == null ? void 0 : selection.type) === "change" || !selection),
-      rxjs.share()
-    );
+    const selection$ = trackedSelection$;
     const selectionStart$ = trackedSelection$.pipe(
       rxjs.map((selection) => !!selection),
       rxjs.distinctUntilChanged(),
@@ -8771,9 +8743,9 @@
       rxjs.withLatestFrom(selection$),
       rxjs.map(([, selection]) => selection),
       rxjs.startWith(void 0),
-      rxjs.shareReplay(1)
+      rxjs.shareReplay({ refCount: true, bufferSize: 1 })
     );
-    selection$.pipe(rxjs.takeUntil(reader.$.destroy$)).subscribe();
+    rxjs.merge(selection$, lastSelectionOnPointerdown$).pipe(rxjs.takeUntil(reader.$.destroy$)).subscribe();
     return {
       ...reader,
       selection: {