react-native-readium 5.0.0-rc.10 → 5.0.0-rc.12

package/README.md

@@ -326,8 +326,7 @@ DRM is not supported at this time. However, there is a clear path to [support it
 
 | Name                     | Type                                                                                                                                                                                             | Optional           | Description                                                                                                                                                                                                                                                                                                                                                                        |
 | ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `file`                   | [`File`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/File.ts)                                                                                                      | :x:                | A file object containing the path to the eBook file on disk.                                                                                                                                                                                                                                                                                                                       |
-| `location`               | [`Locator`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Locator.ts) \| [`Link`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Link.ts) | :white_check_mark: | A locator prop that allows you to externally control the location of the reader (e.g. Chapters or Bookmarks). <br/><br/>:warning: If you want to set the `location` of an ebook on initial load, you should use the `File.initialLocation` property (look at the `file` prop). See more [here](https://github.com/5-stones/react-native-readium/issues/16#issuecomment-1344128937) |
+| `file`                   | [`File`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/File.ts)                                                                                                      | :x:                | A file object containing the path to the eBook file on disk. Use `File.initialLocation` to set the reader's position on mount.                                                                                                                                                                                                                                                     |
 | `preferences`            | [`Partial<Preferences>`](https://github.com/readium/swift-toolkit/blob/main/docs/Guides/Navigator%20Preferences.md#appendix-preference-constraints)                                              | :white_check_mark: | An object that allows you to control various aspects of the reader's UI (epub only)                                                                                                                                                                                                                                                                                                |
 | `decorations`            | [`DecorationGroup[]`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Decoration.ts)                                                                                   | :white_check_mark: | An array of decoration groups to render in the publication (e.g. highlights, underlines).                                                                                                                                                                                                                                                                                           |
 | `selectionActions`       | [`SelectionAction[]`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/SelectionAction.ts)                                                                              | :white_check_mark: | Custom actions to show in the context menu when the user selects text.                                                                                                                                                                                                                                                                                                             |
@@ -345,11 +344,15 @@ The `ReadiumView` component accepts a ref that exposes imperative navigation met
 ```tsx
 import React, { useRef } from 'react';
 import { ReadiumView } from 'react-native-readium';
-import type { ReadiumViewRef } from 'react-native-readium';
+import type { ReadiumViewRef, Locator } from 'react-native-readium';
 
 const MyComponent: React.FC = () => {
   const ref = useRef<ReadiumViewRef>(null);
 
+  const goToChapter = (locator: Locator) => {
+    ref.current?.goTo(locator);
+  };
+
   return (
     <>
       <ReadiumView ref={ref} file={file} />
@@ -360,10 +363,11 @@ const MyComponent: React.FC = () => {
 };
 ```
 
-| Method        | Description                                              |
-| ------------- | -------------------------------------------------------- |
-| `goForward()` | Navigate forward in the publication (e.g. next page).    |
-| `goBackward()`| Navigate backward in the publication (e.g. previous page). |
+| Method             | Description                                                                      |
+| ------------------ | -------------------------------------------------------------------------------- |
+| `goTo(locator)`    | Navigate to a specific location in the publication (e.g. a chapter or bookmark). |
+| `goForward()`      | Navigate forward in the publication (e.g. next page).                            |
+| `goBackward()`     | Navigate backward in the publication (e.g. previous page).                       |
 
 #### :warning: Web vs Native File URLs
 

package/android/src/main/java/com/reactnativereadium/HybridReadiumView.kt

@@ -79,12 +79,6 @@ class HybridReadiumView(private val context: android.content.Context) : HybridRe
       }
     }
 
-  override var location: Locator? = null
-    set(value) {
-      field = value
-      updateLocation()
-    }
-
   override var preferences: Preferences? = null
     set(value) {
       field = value
@@ -118,15 +112,6 @@ class HybridReadiumView(private val context: android.content.Context) : HybridRe
     }
   }
 
-  // MARK: - Location
-
-  private fun updateLocation() {
-    val loc = location ?: return
-    val frag = fragment ?: return
-    val readiumLocator = nitroLocatorToReadium(loc) ?: return
-    frag.go(com.reactnativereadium.utils.LinkOrLocator.Locator(readiumLocator), true)
-  }
-
   // MARK: - Preferences
 
   private fun updatePreferences() {
@@ -159,6 +144,18 @@ class HybridReadiumView(private val context: android.content.Context) : HybridRe
 
   // MARK: - Imperative navigation
 
+  override fun goTo(locator: Locator) {
+    val action = Runnable {
+      val readiumLocator = nitroLocatorToReadium(locator) ?: return@Runnable
+      fragment?.go(com.reactnativereadium.utils.LinkOrLocator.Locator(readiumLocator), true)
+    }
+    if (android.os.Looper.myLooper() == android.os.Looper.getMainLooper()) {
+      action.run()
+    } else {
+      hostView.post(action)
+    }
+  }
+
   override fun goForward() { fragment?.goForward() }
   override fun goBackward() { fragment?.goBackward() }
   override fun destroy() {

package/ios/HybridReadiumView.swift

@@ -21,12 +21,6 @@ class HybridReadiumView: HybridReadiumViewSpec {
     }
   }
 
-  var location: Locator? = nil {
-    didSet {
-      updateLocation()
-    }
-  }
-
   var preferences: Preferences? = nil {
     didSet {
       updatePreferences()
@@ -115,24 +109,6 @@ class HybridReadiumView: HybridReadiumViewSpec {
     )
   }
 
-  // MARK: - Location
-
-  private func updateLocation() {
-    Task { @MainActor [weak self] in
-      guard let self = self else { return }
-      guard let navigator = self.readerViewController?.navigator else { return }
-      guard let loc = self.location else { return }
-      guard let locator = nitroLocatorToReadium(loc) else { return }
-
-      let currentLocation = navigator.currentLocation
-      if let currentLocation, locator.hashValue == currentLocation.hashValue {
-        return
-      }
-
-      _ = await navigator.go(to: locator, options: .animated)
-    }
-  }
-
   // MARK: - Preferences
 
   private func updatePreferences() {
@@ -267,6 +243,15 @@ class HybridReadiumView: HybridReadiumViewSpec {
 
   // MARK: - Imperative navigation
 
+  func goTo(locator: Locator) {
+    Task { @MainActor [weak self] in
+      guard let self else { return }
+      guard let navigator = self.readerViewController?.navigator else { return }
+      guard let readiumLocator = nitroLocatorToReadium(locator) else { return }
+      _ = await navigator.go(to: readiumLocator, options: .animated)
+    }
+  }
+
   func goForward() {
     Task { @MainActor in
       guard let navigator = readerViewController?.navigator else { return }

package/lib/nitrogen/generated/shared/json/ReadiumViewConfig.json

@@ -5,7 +5,6 @@
     "directEventTypes": {},
     "validAttributes": {
         "file": true,
-        "location": true,
         "preferences": true,
         "decorations": true,
         "selectionActions": true,

package/lib/src/components/ReadiumView.js

@@ -25,6 +25,7 @@ export const ReadiumView = forwardRef(({ onLocationChange, onPublicationReady, o
         });
     }, [onPublicationReady]);
     useImperativeHandle(forwardedRef, () => ({
+        goTo: (locator) => hybridRef.current?.goTo(locator),
         goForward: () => hybridRef.current?.goForward(),
         goBackward: () => hybridRef.current?.goBackward(),
     }), []);

package/lib/src/components/ReadiumView.types.d.ts

@@ -1,11 +1,11 @@
 import type { Preferences, Locator, File, DecorationGroup, SelectionAction, PublicationReadyEvent, DecorationActivatedEvent, SelectionEvent, SelectionActionEvent } from '../interfaces';
 export type ReadiumViewRef = {
+    goTo: (locator: Locator) => void;
     goForward: () => void;
     goBackward: () => void;
 };
 export type ReadiumProps = {
     file: File;
-    location?: Locator;
     preferences: Preferences;
     decorations?: DecorationGroup[];
     selectionActions?: SelectionAction[];

package/lib/src/components/ReadiumView.web.js

@@ -1,7 +1,8 @@
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import { View, StyleSheet } from 'react-native';
-import { useNavigator, usePreferencesObserver, useLocationObserver, useDecorationsObserver, } from '../../web/hooks';
-export const ReadiumView = React.forwardRef(({ file, preferences, location, decorations, onLocationChange, onPublicationReady, onDecorationActivated, style = {}, height, width, }, ref) => {
+import { useNavigator, usePreferencesObserver, useDecorationsObserver, } from '../../web/hooks';
+import { convertToNavigatorLocator } from '../../web/utils/locationNormalizer';
+export const ReadiumView = React.forwardRef(({ file, preferences, decorations, onLocationChange, onPublicationReady, onDecorationActivated, style = {}, height, width, }, ref) => {
     const [container, setContainer] = useState(null);
     const [currentPosition, setCurrentPosition] = useState(null);
     // Convert DecorationGroup[] to DecorationGroups record for web hooks
@@ -16,6 +17,15 @@ export const ReadiumView = React.forwardRef(({ file, preferences, location, deco
         onPositionChange: setCurrentPosition,
     });
     useImperativeHandle(ref, () => ({
+        goTo: (locator) => {
+            if (!navigator)
+                return;
+            const navLocator = convertToNavigatorLocator(locator);
+            if (navLocator) {
+                // @ts-ignore
+                navigator.go(navLocator, true, () => { });
+            }
+        },
         goForward: () => {
             navigator?.goForward(true, () => { });
         },
@@ -32,7 +42,6 @@ export const ReadiumView = React.forwardRef(({ file, preferences, location, deco
         },
     }), [navigator]);
     usePreferencesObserver(navigator, preferences);
-    useLocationObserver(navigator, location);
     useDecorationsObserver(navigator, decorationsRecord, onDecorationActivated);
     // Generate position label text
     const positionLabel = currentPosition && positions.length > 0

package/lib/src/specs/ReadiumView.nitro.d.ts

@@ -180,7 +180,6 @@ export interface ReadiumFile {
 }
 export interface ReadiumViewProps extends HybridViewProps {
     file?: ReadiumFile;
-    location?: Locator;
     preferences?: Preferences;
     decorations?: DecorationGroup[];
     selectionActions?: SelectionAction[];
@@ -191,6 +190,7 @@ export interface ReadiumViewProps extends HybridViewProps {
     onSelectionAction?: (event: SelectionActionEvent) => void;
 }
 export interface ReadiumViewMethods extends HybridViewMethods {
+    goTo(locator: Locator): void;
     goForward(): void;
     goBackward(): void;
     destroy(): void;

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

@@ -1,5 +1,4 @@
 export * from './useNavigator';
 export * from './usePreferencesObserver';
-export * from './useLocationObserver';
 export * from './usePositionLabel';
 export * from './useDecorationsObserver';

package/lib/web/hooks/index.js

@@ -1,5 +1,4 @@
 export * from './useNavigator';
 export * from './usePreferencesObserver';
-export * from './useLocationObserver';
 export * from './usePositionLabel';
 export * from './useDecorationsObserver';

package/lib/web/hooks/useNavigator.js

@@ -53,7 +53,18 @@ export const useNavigator = ({ file, onLocationChange, onPublicationReady, conta
             // 3. Create the publication
             const publication = new Publication({ manifest, fetcher });
             // 4. Create positions array for navigation
-            const positionsArray = createPositions(publication);
+            // Try loading granular positions from manifest (generated server-side),
+            // fall back to chapter-based positions for older manifests
+            let positionsArray;
+            try {
+                const manifestPositions = await publication.positionsFromManifest();
+                positionsArray = manifestPositions.length > 0
+                    ? manifestPositions
+                    : createPositions(publication);
+            }
+            catch {
+                positionsArray = createPositions(publication);
+            }
             readingOrder.current = positionsArray;
             setPositions(positionsArray);
             // 5. Create navigator listeners

package/nitrogen/generated/android/c++/JHybridReadiumViewSpec.cpp

@@ -157,15 +157,6 @@ namespace margelo::nitro::readium {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JReadiumFile> /* file */)>("setFile");
     method(_javaPart, file.has_value() ? JReadiumFile::fromCpp(file.value()) : nullptr);
   }
-  std::optional<Locator> JHybridReadiumViewSpec::getLocation() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JLocator>()>("getLocation");
-    auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
-  }
-  void JHybridReadiumViewSpec::setLocation(const std::optional<Locator>& location) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JLocator> /* location */)>("setLocation");
-    method(_javaPart, location.has_value() ? JLocator::fromCpp(location.value()) : nullptr);
-  }
   std::optional<Preferences> JHybridReadiumViewSpec::getPreferences() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPreferences>()>("getPreferences");
     auto __result = method(_javaPart);
@@ -316,6 +307,10 @@ namespace margelo::nitro::readium {
   }
 
   // Methods
+  void JHybridReadiumViewSpec::goTo(const Locator& locator) {
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JLocator> /* locator */)>("goTo");
+    method(_javaPart, JLocator::fromCpp(locator));
+  }
   void JHybridReadiumViewSpec::goForward() {
     static const auto method = javaClassStatic()->getMethod<void()>("goForward");
     method(_javaPart);

package/nitrogen/generated/android/c++/JHybridReadiumViewSpec.hpp

@@ -53,8 +53,6 @@ namespace margelo::nitro::readium {
     // Properties
     std::optional<ReadiumFile> getFile() override;
     void setFile(const std::optional<ReadiumFile>& file) override;
-    std::optional<Locator> getLocation() override;
-    void setLocation(const std::optional<Locator>& location) override;
     std::optional<Preferences> getPreferences() override;
     void setPreferences(const std::optional<Preferences>& preferences) override;
     std::optional<std::vector<DecorationGroup>> getDecorations() override;
@@ -74,6 +72,7 @@ namespace margelo::nitro::readium {
 
   public:
     // Methods
+    void goTo(const Locator& locator) override;
     void goForward() override;
     void goBackward() override;
     void destroy() override;

package/nitrogen/generated/android/c++/views/JHybridReadiumViewStateUpdater.cpp

@@ -41,10 +41,6 @@ void JHybridReadiumViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass>
     view->setFile(props->file.value);
     props->file.isDirty = false;
   }
-  if (props->location.isDirty) {
-    view->setLocation(props->location.value);
-    props->location.isDirty = false;
-  }
   if (props->preferences.isDirty) {
     view->setPreferences(props->preferences.value);
     props->preferences.isDirty = false;

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativereadium/HybridReadiumViewSpec.kt

@@ -48,12 +48,6 @@ abstract class HybridReadiumViewSpec: HybridView() {
   @set:Keep
   abstract var file: ReadiumFile?
   
-  @get:DoNotStrip
-  @get:Keep
-  @set:DoNotStrip
-  @set:Keep
-  abstract var location: Locator?
-  
   @get:DoNotStrip
   @get:Keep
   @set:DoNotStrip
@@ -143,6 +137,10 @@ abstract class HybridReadiumViewSpec: HybridView() {
     }
 
   // Methods
+  @DoNotStrip
+  @Keep
+  abstract fun goTo(locator: Locator): Unit
+  
   @DoNotStrip
   @Keep
   abstract fun goForward(): Unit

package/nitrogen/generated/ios/c++/HybridReadiumViewSpecSwift.hpp

@@ -141,13 +141,6 @@ namespace margelo::nitro::readium {
     inline void setFile(const std::optional<ReadiumFile>& file) noexcept override {
       _swiftPart.setFile(file);
     }
-    inline std::optional<Locator> getLocation() noexcept override {
-      auto __result = _swiftPart.getLocation();
-      return __result;
-    }
-    inline void setLocation(const std::optional<Locator>& location) noexcept override {
-      _swiftPart.setLocation(location);
-    }
     inline std::optional<Preferences> getPreferences() noexcept override {
       auto __result = _swiftPart.getPreferences();
       return __result;
@@ -207,6 +200,12 @@ namespace margelo::nitro::readium {
 
   public:
     // Methods
+    inline void goTo(const Locator& locator) override {
+      auto __result = _swiftPart.goTo(std::forward<decltype(locator)>(locator));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
     inline void goForward() override {
       auto __result = _swiftPart.goForward();
       if (__result.hasError()) [[unlikely]] {

package/nitrogen/generated/ios/c++/views/HybridReadiumViewComponent.mm

@@ -77,11 +77,6 @@ using namespace margelo::nitro::readium::views;
     swiftPart.setFile(newViewProps.file.value);
     newViewProps.file.isDirty = false;
   }
-  // location: optional
-  if (newViewProps.location.isDirty) {
-    swiftPart.setLocation(newViewProps.location.value);
-    newViewProps.location.isDirty = false;
-  }
   // preferences: optional
   if (newViewProps.preferences.isDirty) {
     swiftPart.setPreferences(newViewProps.preferences.value);

package/nitrogen/generated/ios/swift/HybridReadiumViewSpec.swift

@@ -11,7 +11,6 @@ import NitroModules
 public protocol HybridReadiumViewSpec_protocol: HybridObject, HybridView {
   // Properties
   var file: ReadiumFile? { get set }
-  var location: Locator? { get set }
   var preferences: Preferences? { get set }
   var decorations: [DecorationGroup]? { get set }
   var selectionActions: [SelectionAction]? { get set }
@@ -22,6 +21,7 @@ public protocol HybridReadiumViewSpec_protocol: HybridObject, HybridView {
   var onSelectionAction: ((_ event: SelectionActionEvent) -> Void)? { get set }
 
   // Methods
+  func goTo(locator: Locator) throws -> Void
   func goForward() throws -> Void
   func goBackward() throws -> Void
   func destroy() throws -> Void

package/nitrogen/generated/ios/swift/HybridReadiumViewSpec_cxx.swift

@@ -138,23 +138,6 @@ open class HybridReadiumViewSpec_cxx {
     }
   }
   
-  public final var location: bridge.std__optional_Locator_ {
-    @inline(__always)
-    get {
-      return { () -> bridge.std__optional_Locator_ in
-        if let __unwrappedValue = self.__implementation.location {
-          return bridge.create_std__optional_Locator_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__implementation.location = newValue.value
-    }
-  }
-  
   public final var preferences: bridge.std__optional_Preferences_ {
     @inline(__always)
     get {
@@ -393,6 +376,17 @@ open class HybridReadiumViewSpec_cxx {
   }
 
   // Methods
+  @inline(__always)
+  public final func goTo(locator: Locator) -> bridge.Result_void_ {
+    do {
+      try self.__implementation.goTo(locator: locator)
+      return bridge.create_Result_void_()
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_void_(__exceptionPtr)
+    }
+  }
+  
   @inline(__always)
   public final func goForward() -> bridge.Result_void_ {
     do {

package/nitrogen/generated/shared/c++/HybridReadiumViewSpec.cpp

@@ -16,8 +16,6 @@ namespace margelo::nitro::readium {
     registerHybrids(this, [](Prototype& prototype) {
       prototype.registerHybridGetter("file", &HybridReadiumViewSpec::getFile);
       prototype.registerHybridSetter("file", &HybridReadiumViewSpec::setFile);
-      prototype.registerHybridGetter("location", &HybridReadiumViewSpec::getLocation);
-      prototype.registerHybridSetter("location", &HybridReadiumViewSpec::setLocation);
       prototype.registerHybridGetter("preferences", &HybridReadiumViewSpec::getPreferences);
       prototype.registerHybridSetter("preferences", &HybridReadiumViewSpec::setPreferences);
       prototype.registerHybridGetter("decorations", &HybridReadiumViewSpec::getDecorations);
@@ -34,6 +32,7 @@ namespace margelo::nitro::readium {
       prototype.registerHybridSetter("onSelectionChange", &HybridReadiumViewSpec::setOnSelectionChange);
       prototype.registerHybridGetter("onSelectionAction", &HybridReadiumViewSpec::getOnSelectionAction);
       prototype.registerHybridSetter("onSelectionAction", &HybridReadiumViewSpec::setOnSelectionAction);
+      prototype.registerHybridMethod("goTo", &HybridReadiumViewSpec::goTo);
       prototype.registerHybridMethod("goForward", &HybridReadiumViewSpec::goForward);
       prototype.registerHybridMethod("goBackward", &HybridReadiumViewSpec::goBackward);
       prototype.registerHybridMethod("destroy", &HybridReadiumViewSpec::destroy);

package/nitrogen/generated/shared/c++/HybridReadiumViewSpec.hpp

@@ -15,14 +15,14 @@
 
 // Forward declaration of `ReadiumFile` to properly resolve imports.
 namespace margelo::nitro::readium { struct ReadiumFile; }
-// Forward declaration of `Locator` to properly resolve imports.
-namespace margelo::nitro::readium { struct Locator; }
 // Forward declaration of `Preferences` to properly resolve imports.
 namespace margelo::nitro::readium { struct Preferences; }
 // Forward declaration of `DecorationGroup` to properly resolve imports.
 namespace margelo::nitro::readium { struct DecorationGroup; }
 // Forward declaration of `SelectionAction` to properly resolve imports.
 namespace margelo::nitro::readium { struct SelectionAction; }
+// Forward declaration of `Locator` to properly resolve imports.
+namespace margelo::nitro::readium { struct Locator; }
 // Forward declaration of `PublicationReadyEvent` to properly resolve imports.
 namespace margelo::nitro::readium { struct PublicationReadyEvent; }
 // Forward declaration of `DecorationActivatedEvent` to properly resolve imports.
@@ -34,11 +34,11 @@ namespace margelo::nitro::readium { struct SelectionActionEvent; }
 
 #include "ReadiumFile.hpp"
 #include <optional>
-#include "Locator.hpp"
 #include "Preferences.hpp"
 #include "DecorationGroup.hpp"
 #include <vector>
 #include "SelectionAction.hpp"
+#include "Locator.hpp"
 #include <functional>
 #include "PublicationReadyEvent.hpp"
 #include "DecorationActivatedEvent.hpp"
@@ -74,8 +74,6 @@ namespace margelo::nitro::readium {
       // Properties
       virtual std::optional<ReadiumFile> getFile() = 0;
       virtual void setFile(const std::optional<ReadiumFile>& file) = 0;
-      virtual std::optional<Locator> getLocation() = 0;
-      virtual void setLocation(const std::optional<Locator>& location) = 0;
       virtual std::optional<Preferences> getPreferences() = 0;
       virtual void setPreferences(const std::optional<Preferences>& preferences) = 0;
       virtual std::optional<std::vector<DecorationGroup>> getDecorations() = 0;
@@ -95,6 +93,7 @@ namespace margelo::nitro::readium {
 
     public:
       // Methods
+      virtual void goTo(const Locator& locator) = 0;
       virtual void goForward() = 0;
       virtual void goBackward() = 0;
       virtual void destroy() = 0;

package/nitrogen/generated/shared/c++/views/HybridReadiumViewComponent.cpp

@@ -36,16 +36,6 @@ namespace margelo::nitro::readium::views {
         throw std::runtime_error(std::string("ReadiumView.file: ") + exc.what());
       }
     }()),
-    location([&]() -> CachedProp<std::optional<Locator>> {
-      try {
-        const react::RawValue* rawValue = rawProps.at("location", nullptr, nullptr);
-        if (rawValue == nullptr) return sourceProps.location;
-        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
-        return CachedProp<std::optional<Locator>>::fromRawValue(*runtime, value, sourceProps.location);
-      } catch (const std::exception& exc) {
-        throw std::runtime_error(std::string("ReadiumView.location: ") + exc.what());
-      }
-    }()),
     preferences([&]() -> CachedProp<std::optional<Preferences>> {
       try {
         const react::RawValue* rawValue = rawProps.at("preferences", nullptr, nullptr);
@@ -140,7 +130,6 @@ namespace margelo::nitro::readium::views {
   bool HybridReadiumViewProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       case hashString("file"): return true;
-      case hashString("location"): return true;
       case hashString("preferences"): return true;
       case hashString("decorations"): return true;
       case hashString("selectionActions"): return true;

package/nitrogen/generated/shared/c++/views/HybridReadiumViewComponent.hpp

@@ -18,11 +18,11 @@
 
 #include "ReadiumFile.hpp"
 #include <optional>
-#include "Locator.hpp"
 #include "Preferences.hpp"
 #include "DecorationGroup.hpp"
 #include <vector>
 #include "SelectionAction.hpp"
+#include "Locator.hpp"
 #include <functional>
 #include "PublicationReadyEvent.hpp"
 #include "DecorationActivatedEvent.hpp"
@@ -52,7 +52,6 @@ namespace margelo::nitro::readium::views {
 
   public:
     CachedProp<std::optional<ReadiumFile>> file;
-    CachedProp<std::optional<Locator>> location;
     CachedProp<std::optional<Preferences>> preferences;
     CachedProp<std::optional<std::vector<DecorationGroup>>> decorations;
     CachedProp<std::optional<std::vector<SelectionAction>>> selectionActions;

package/nitrogen/generated/shared/json/ReadiumViewConfig.json

@@ -5,7 +5,6 @@
   "directEventTypes": {},
   "validAttributes": {
     "file": true,
-    "location": true,
     "preferences": true,
     "decorations": true,
     "selectionActions": true,

package/package.json

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

package/src/components/ReadiumView.tsx

@@ -67,6 +67,7 @@ export const ReadiumView = forwardRef<ReadiumViewRef, ReadiumProps>(
     useImperativeHandle(
       forwardedRef,
       () => ({
+        goTo: (locator) => hybridRef.current?.goTo(locator),
         goForward: () => hybridRef.current?.goForward(),
         goBackward: () => hybridRef.current?.goBackward(),
       }),

package/src/components/ReadiumView.types.ts

@@ -11,13 +11,13 @@ import type {
 } from '../interfaces';
 
 export type ReadiumViewRef = {
+  goTo: (locator: Locator) => void;
   goForward: () => void;
   goBackward: () => void;
 };
 
 export type ReadiumProps = {
   file: File;
-  location?: Locator;
   preferences: Preferences;
   decorations?: DecorationGroup[];
   selectionActions?: SelectionAction[];

package/src/components/ReadiumView.web.tsx

@@ -5,9 +5,9 @@ import { View, StyleSheet } from 'react-native';
 import {
   useNavigator,
   usePreferencesObserver,
-  useLocationObserver,
   useDecorationsObserver,
 } from '../../web/hooks';
+import { convertToNavigatorLocator } from '../../web/utils/locationNormalizer';
 import type { ReadiumProps as BaseReadiumProps, ReadiumViewRef as BaseReadiumViewRef } from './ReadiumView.types';
 
 export type ReadiumProps = BaseReadiumProps & {
@@ -27,7 +27,6 @@ export const ReadiumView = React.forwardRef<ReadiumViewRef, ReadiumProps>(
     {
       file,
       preferences,
-      location,
       decorations,
       onLocationChange,
       onPublicationReady,
@@ -57,6 +56,14 @@ export const ReadiumView = React.forwardRef<ReadiumViewRef, ReadiumProps>(
     useImperativeHandle(
       ref,
       () => ({
+        goTo: (locator) => {
+          if (!navigator) return;
+          const navLocator = convertToNavigatorLocator(locator);
+          if (navLocator) {
+            // @ts-ignore
+            navigator.go(navLocator, true, () => {});
+          }
+        },
         goForward: () => {
           navigator?.goForward(true, () => {});
         },
@@ -76,7 +83,6 @@ export const ReadiumView = React.forwardRef<ReadiumViewRef, ReadiumProps>(
     );
 
     usePreferencesObserver(navigator, preferences);
-    useLocationObserver(navigator, location);
     useDecorationsObserver(navigator, decorationsRecord, onDecorationActivated);
 
     // Generate position label text

package/src/specs/ReadiumView.nitro.ts

@@ -228,7 +228,6 @@ export interface ReadiumFile {
 
 export interface ReadiumViewProps extends HybridViewProps {
   file?: ReadiumFile;
-  location?: Locator;
   preferences?: Preferences;
   decorations?: DecorationGroup[];
   selectionActions?: SelectionAction[];
@@ -240,6 +239,7 @@ export interface ReadiumViewProps extends HybridViewProps {
 }
 
 export interface ReadiumViewMethods extends HybridViewMethods {
+  goTo(locator: Locator): void;
   goForward(): void;
   goBackward(): void;
   destroy(): void;

package/web/hooks/index.ts

@@ -1,5 +1,4 @@
 export * from './useNavigator';
 export * from './usePreferencesObserver';
-export * from './useLocationObserver';
 export * from './usePositionLabel';
 export * from './useDecorationsObserver';

package/web/hooks/useNavigator.ts

@@ -95,7 +95,17 @@ export const useNavigator = ({
       const publication = new Publication({ manifest, fetcher });
 
       // 4. Create positions array for navigation
-      const positionsArray = createPositions(publication);
+      // Try loading granular positions from manifest (generated server-side),
+      // fall back to chapter-based positions for older manifests
+      let positionsArray: Locator[];
+      try {
+        const manifestPositions = await publication.positionsFromManifest();
+        positionsArray = manifestPositions.length > 0
+          ? manifestPositions
+          : createPositions(publication);
+      } catch {
+        positionsArray = createPositions(publication);
+      }
       readingOrder.current = positionsArray;
       setPositions(positionsArray);
 

package/lib/web/hooks/useLocationObserver.d.ts

@@ -1,3 +0,0 @@
-import { EpubNavigator } from '@readium/navigator';
-import type { Link, Locator } from '../../src/interfaces';
-export declare const useLocationObserver: (navigator?: EpubNavigator | null, location?: Link | Locator | null) => void;

package/lib/web/hooks/useLocationObserver.js

@@ -1,22 +0,0 @@
-import { useRef } from 'react';
-import { useDeepCompareEffect } from 'use-deep-compare';
-export const useLocationObserver = (navigator, location) => {
-    const lastHrefRef = useRef(null);
-    useDeepCompareEffect(() => {
-        // Only navigate if we have a navigator, a location, and the href has changed.
-        // Skip navigation if location.locations exists with progression and totalProgression
-        // (it's from the navigator's positionChanged callback)
-        const hasFullLocationData = 'locations' in (location ?? {}) &&
-            location.locations?.progression !== undefined &&
-            location.locations?.totalProgression !== undefined;
-        if (navigator &&
-            location &&
-            location.href !== lastHrefRef.current &&
-            !hasFullLocationData) {
-            lastHrefRef.current = location.href;
-            // For Link objects (from TOC), we can pass them directly
-            // @ts-ignore
-            navigator.go(location, true, () => { });
-        }
-    }, [location?.href, !!navigator]);
-};

package/web/hooks/useLocationObserver.ts

@@ -1,34 +0,0 @@
-import { useRef } from 'react';
-import { useDeepCompareEffect } from 'use-deep-compare';
-import { EpubNavigator } from '@readium/navigator';
-
-import type { Link, Locator } from '../../src/interfaces';
-
-export const useLocationObserver = (
-  navigator?: EpubNavigator | null,
-  location?: Link | Locator | null
-) => {
-  const lastHrefRef = useRef<string | null>(null);
-
-  useDeepCompareEffect(() => {
-    // Only navigate if we have a navigator, a location, and the href has changed.
-    // Skip navigation if location.locations exists with progression and totalProgression
-    // (it's from the navigator's positionChanged callback)
-    const hasFullLocationData =
-      'locations' in (location ?? {}) &&
-      (location as Locator).locations?.progression !== undefined &&
-      (location as Locator).locations?.totalProgression !== undefined;
-
-    if (
-      navigator &&
-      location &&
-      location.href !== lastHrefRef.current &&
-      !hasFullLocationData
-    ) {
-      lastHrefRef.current = location.href;
-      // For Link objects (from TOC), we can pass them directly
-      // @ts-ignore
-      navigator.go(location, true, () => {});
-    }
-  }, [location?.href, !!navigator]);
-};