react-native-readium 5.0.0-rc.15 → 5.0.0-rc.16

package/lib/web/hooks/useNavigator.js

@@ -1,11 +1,7 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { EpubNavigator } from '@readium/navigator';
 import { Publication } from '@readium/shared';
-import { normalizeMetadata } from '../utils/metadataNormalizer';
-import { fetchManifest } from '../utils/manifestFetcher';
-import { createNavigatorListeners } from '../utils/navigatorListeners';
-import { normalizePublicationURL, createPositions, extractTableOfContents, } from '../utils/publicationUtils';
-import { convertToNavigatorLocator } from '../utils/locationNormalizer';
+import { createNavigatorListeners, createPositions, extractTableOfContents, fetchManifest, normalizeMetadata, normalizePublicationURL, sanitizeInitialLocation, } from '../utils';
 export const useNavigator = ({ file, onLocationChange, onPublicationReady, container, onPositionChange, }) => {
     const [navigator, setNavigator] = useState(null);
     const navigatorRef = useRef(null);
@@ -75,10 +71,9 @@ export const useNavigator = ({ file, onLocationChange, onPublicationReady, conta
             setPositions(positionsArray);
             // 5. Create navigator listeners
             const listeners = createNavigatorListeners(onLocationChangeWithTotalProgression, onPositionChange);
-            // 6. Process initial location
-            const initialPosition = file.initialLocation
-                ? convertToNavigatorLocator(file.initialLocation)
-                : undefined;
+            // 6. Process initial location, sanitizing the position number to match
+            // the resolved positions array (handles scheme mismatch between sessions)
+            const initialPosition = sanitizeInitialLocation(file.initialLocation, positionsArray);
             // 7. Initialize and load the navigator
             const configuration = {
                 preferences: { scroll: false },

package/lib/web/utils/index.d.ts

@@ -0,0 +1,7 @@
+export * from './locationNormalizer';
+export * from './manifestFetcher';
+export * from './manifestNormalizer';
+export * from './metadataNormalizer';
+export * from './navigatorListeners';
+export * from './publicationUtils';
+export * from './sanitizeInitialLocation';

package/lib/web/utils/index.js

@@ -0,0 +1,7 @@
+export * from './locationNormalizer';
+export * from './manifestFetcher';
+export * from './manifestNormalizer';
+export * from './metadataNormalizer';
+export * from './navigatorListeners';
+export * from './publicationUtils';
+export * from './sanitizeInitialLocation';

package/lib/web/utils/sanitizeInitialLocation.d.ts

@@ -0,0 +1,3 @@
+import type { Locator } from '@readium/shared';
+import type { Link, Locator as LocalLocator } from '../../src/interfaces';
+export declare const sanitizeInitialLocation: (initialLocation: Link | LocalLocator | undefined, positionsArray: Locator[]) => Locator | undefined;

package/lib/web/utils/sanitizeInitialLocation.js

@@ -0,0 +1,28 @@
+import { convertToNavigatorLocator } from './locationNormalizer';
+export const sanitizeInitialLocation = (initialLocation, positionsArray) => {
+    if (!initialLocation) {
+        return undefined;
+    }
+    const normalizedPosition = convertToNavigatorLocator(initialLocation);
+    if (!positionsArray.length) {
+        return normalizedPosition;
+    }
+    if (!normalizedPosition) {
+        return undefined;
+    }
+    const positionExists = positionsArray.some((p) => p.locations.position === normalizedPosition.locations.position);
+    if (positionExists) {
+        return normalizedPosition;
+    }
+    const matchByHref = positionsArray.find((p) => p.href === normalizedPosition.href);
+    if (matchByHref) {
+        return {
+            ...matchByHref,
+            locations: {
+                ...matchByHref.locations,
+                progression: normalizedPosition.locations.progression,
+            },
+        };
+    }
+    return undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-readium",
-  "version": "5.0.0-rc.15",
+  "version": "5.0.0-rc.16",
   "description": "A react-native wrapper for https://readium.org/",
   "main": "lib/src/index",
   "types": "lib/src/index.d.ts",

package/web/hooks/useNavigator.ts

@@ -4,15 +4,15 @@ import { EpubNavigator } from '@readium/navigator';
 import { Locator, Publication } from '@readium/shared';
 
 import type { ReadiumProps } from '../../src/components/ReadiumView';
-import { normalizeMetadata } from '../utils/metadataNormalizer';
-import { fetchManifest } from '../utils/manifestFetcher';
-import { createNavigatorListeners } from '../utils/navigatorListeners';
 import {
-  normalizePublicationURL,
+  createNavigatorListeners,
   createPositions,
   extractTableOfContents,
-} from '../utils/publicationUtils';
-import { convertToNavigatorLocator } from '../utils/locationNormalizer';
+  fetchManifest,
+  normalizeMetadata,
+  normalizePublicationURL,
+  sanitizeInitialLocation,
+} from '../utils';
 
 interface RefProps
   extends Pick<
@@ -121,10 +121,12 @@ export const useNavigator = ({
         onPositionChange
       );
 
-      // 6. Process initial location
-      const initialPosition = file.initialLocation
-        ? convertToNavigatorLocator(file.initialLocation)
-        : undefined;
+      // 6. Process initial location, sanitizing the position number to match
+      // the resolved positions array (handles scheme mismatch between sessions)
+      const initialPosition = sanitizeInitialLocation(
+        file.initialLocation,
+        positionsArray
+      );
 
       // 7. Initialize and load the navigator
       const configuration = {

package/web/utils/index.ts

@@ -0,0 +1,7 @@
+export * from './locationNormalizer';
+export * from './manifestFetcher';
+export * from './manifestNormalizer';
+export * from './metadataNormalizer';
+export * from './navigatorListeners';
+export * from './publicationUtils';
+export * from './sanitizeInitialLocation';

package/web/utils/sanitizeInitialLocation.ts

@@ -0,0 +1,47 @@
+import type { Locator } from '@readium/shared';
+
+import type { Link, Locator as LocalLocator } from '../../src/interfaces';
+import { convertToNavigatorLocator } from './locationNormalizer';
+
+export const sanitizeInitialLocation = (
+  initialLocation: Link | LocalLocator | undefined,
+  positionsArray: Locator[]
+): Locator | undefined => {
+  if (!initialLocation) {
+    return undefined;
+  }
+
+  const normalizedPosition = convertToNavigatorLocator(initialLocation);
+
+  if (!positionsArray.length) {
+    return normalizedPosition;
+  }
+
+  if (!normalizedPosition) {
+    return undefined;
+  }
+
+  const positionExists = positionsArray.some(
+    (p) => p.locations.position === normalizedPosition.locations.position
+  );
+
+  if (positionExists) {
+    return normalizedPosition;
+  }
+
+  const matchByHref = positionsArray.find(
+    (p) => p.href === normalizedPosition.href
+  );
+
+  if (matchByHref) {
+    return {
+      ...matchByHref,
+      locations: {
+        ...matchByHref.locations,
+        progression: normalizedPosition.locations.progression,
+      },
+    } as Locator;
+  }
+
+  return undefined;
+};