@prose-reader/core 1.98.0 → 1.100.0

package/dist/enhancers/events/normalizeEventForViewport.d.ts

@@ -1,2 +1,2 @@
 import { SpineLocator } from '../../spine/locator/SpineLocator';
-export declare const normalizeEventForViewport: <E extends MouseEvent | TouchEvent | PointerEvent>(event: E, locator: SpineLocator) => E;
+export declare const normalizeEventForViewport: <E extends MouseEvent | TouchEvent | PointerEvent>(event: E, iframeOriginalEvent: E, locator: SpineLocator) => E;

package/dist/enhancers/navigation/navigators/manualNavigator.d.ts

@@ -1,5 +1,6 @@
 import { Reader } from '../../../reader';
 import { ViewportPosition } from '../../../navigation/viewport/ViewportNavigator';
+import { UserNavigationEntry } from '../../../navigation/UserNavigator';
 export declare class ManualNavigator {
     protected reader: Reader;
     movingLastDelta: {
@@ -18,7 +19,9 @@ export declare class ManualNavigator {
     goToCfi(cfi: string, options?: {
         animate: boolean;
     }): void;
-    goToSpineItem(indexOrId: number | string): void;
+    goToSpineItem({ indexOrId, ...rest }: {
+        indexOrId: number | string;
+    } & Pick<UserNavigationEntry, "animation">): void;
     goToNextSpineItem(): void;
     goToPreviousSpineItem(): void;
     goToUrl(url: string | URL): void;
@@ -28,5 +31,8 @@ export declare class ManualNavigator {
     goToLeftSpineItem(): void;
     goToTopSpineItem(): void;
     goToBottomSpineItem(): void;
-    goToPageOfSpineItem(pageIndex: number, spineItemId: string | number): void;
+    goToPageOfSpineItem({ pageIndex, spineItemId, ...rest }: {
+        pageIndex: number;
+        spineItemId: string | number;
+    } & Pick<UserNavigationEntry, "animation">): void;
 }

package/dist/index.js

@@ -189,18 +189,18 @@ const hotkeysEnhancer = (next) => (options) => {
     map$1(([e, { pageTurnDirection }]) => {
       if (pageTurnDirection === "horizontal") {
         if (e.key === `ArrowRight`) {
-          reader.navigation.turnRight();
+          return reader.navigation.turnRight();
         }
         if (e.key === `ArrowLeft`) {
-          reader.navigation.turnLeft();
+          return reader.navigation.turnLeft();
         }
       }
       if (pageTurnDirection === "vertical") {
         if (e.key === `ArrowDown`) {
-          reader.navigation.turnRight();
+          return reader.navigation.turnRight();
         }
         if (e.key === `ArrowUp`) {
-          reader.navigation.turnLeft();
+          return reader.navigation.turnLeft();
         }
       }
       return e;
@@ -881,7 +881,10 @@ class ManualNavigator {
       cfi
     });
   }
-  goToSpineItem(indexOrId) {
+  goToSpineItem({
+    indexOrId,
+    ...rest
+  }) {
     const spineItem = this.reader.spineItemsManager.get(indexOrId);
     if (spineItem === void 0) {
       Report.warn(
@@ -891,7 +894,8 @@ class ManualNavigator {
       return;
     }
     this.reader.navigation.navigate({
-      spineItem: indexOrId
+      spineItem: indexOrId,
+      ...rest
     });
   }
   goToNextSpineItem() {
@@ -899,14 +903,14 @@ class ManualNavigator {
       position: this.reader.navigation.getNavigation().position,
       threshold: 0.5
     }) || {};
-    this.goToSpineItem(endIndex + 1);
+    this.goToSpineItem({ indexOrId: endIndex + 1 });
   }
   goToPreviousSpineItem() {
     const { beginIndex = 0 } = this.reader.spine.locator.getVisibleSpineItemsFromPosition({
       position: this.reader.navigation.getNavigation().position,
       threshold: 0.5
     }) ?? {};
-    this.goToSpineItem(beginIndex - 1);
+    this.goToSpineItem({ indexOrId: beginIndex - 1 });
   }
   goToUrl(url) {
     this.reader.navigation.navigate({
@@ -967,13 +971,18 @@ class ManualNavigator {
     }
     return this.goToNextSpineItem();
   }
-  goToPageOfSpineItem(pageIndex, spineItemId) {
+  goToPageOfSpineItem({
+    pageIndex,
+    spineItemId,
+    ...rest
+  }) {
     const position = this.reader.navigation.navigationResolver.getNavigationForSpineItemPage({
       pageIndex,
       spineItemId
     });
     this.reader.navigation.navigate({
-      position
+      position,
+      ...rest
     });
   }
 }
@@ -7941,23 +7950,10 @@ const defaultLoadingElementCreate = ({
   container.appendChild(detailsElement);
   return container;
 };
-const __UNSAFE_REFERENCE_ORIGINAL_IFRAME_EVENT_KEY = `__UNSAFE_REFERENCE_ORIGINAL_IFRAME_EVENT`;
-const attachOriginalFrameEventToDocumentEvent = (event, frameEvent) => {
-  Object.defineProperty(event, __UNSAFE_REFERENCE_ORIGINAL_IFRAME_EVENT_KEY, {
-    value: frameEvent,
-    enumerable: true
-  });
-};
-const getOriginalFrameEventFromDocumentEvent = (event) => {
-  return event[__UNSAFE_REFERENCE_ORIGINAL_IFRAME_EVENT_KEY];
-};
-const normalizeEventForViewport = (event, locator) => {
+const normalizeEventForViewport = (event, iframeOriginalEvent, locator) => {
   var _a;
-  const eventIsComingFromBridge = __UNSAFE_REFERENCE_ORIGINAL_IFRAME_EVENT_KEY in event;
-  const iframeOriginalEvent = getOriginalFrameEventFromDocumentEvent(event);
   const originalFrame = (_a = iframeOriginalEvent == null ? void 0 : iframeOriginalEvent.view) == null ? void 0 : _a.frameElement;
-  if (!eventIsComingFromBridge || !iframeOriginalEvent || !originalFrame)
-    return event;
+  if (!iframeOriginalEvent || !originalFrame) return event;
   const spineItem = locator.getSpineItemFromIframe(originalFrame);
   if (!spineItem) return event;
   if (isPointerEvent(event)) {
@@ -8038,9 +8034,9 @@ const eventsEnhancer = (next) => (options) => {
           convertedEvent = new PointerEvent(e.type, e);
         }
         if (convertedEvent !== e) {
-          attachOriginalFrameEventToDocumentEvent(convertedEvent, e);
           const normalizedEvent = normalizeEventForViewport(
             convertedEvent,
+            e,
             reader.spine.locator
           );
           (_a2 = reader.context.state.containerElement) == null ? void 0 : _a2.dispatchEvent(