react-native-readium 4.0.2 → 5.0.0-rc.0

package/README.md

@@ -24,7 +24,7 @@ allows you to do things like:
 
 - Render an ebook view.
 - Register for location changes (as the user pages through the book).
-- Register for the Table of Contents (so that you can display things like chapters in your app)
+- Access publication metadata including table of contents, positions, and more via the `onPublicationReady` callback
 - Control settings of the Reader. Things like:
   - Dark Mode, Light Mode, Sepia Mode
   - Font Size
@@ -71,36 +71,59 @@ yarn add react-native-readium
 
 #### iOS
 
+Requirements:
+- Minimum iOS deployment target: iOS 13.4
+- Swift compiler: Swift 6.0
+- Xcode: Xcode 16.2 (or newer)
+
 Due to the current state of the `Readium` swift libraries you need to manually
 update your `Podfile` ([see more on that here](https://github.com/readium/swift-toolkit/issues/38)).
 
+##### Breaking change when upgrading from v4 to v5!
+
+If you are migrating from v4 to v5, please note that you must update your iOS Podfile to use the new Readium Pods (see iOS documentation below). Please make a note of both the new Pod names and the addition of the `source`'s in the Podfile.
+
 ```rb
 # ./ios/Podfile
+source 'https://github.com/readium/podspecs'
+source 'https://cdn.cocoapods.org/'
+
 ...
-platform :ios, '13.0'
+
+platform :ios, '13.4'
 
 ...
 
 target 'ExampleApp' do
   config = use_native_modules!
   ...
-  pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.5/GCDWebServer.podspec', modular_headers: true
-  pod 'ReadiumAdapterGCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec', modular_headers: true
-  pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumNavigator.podspec'
-  pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumShared.podspec'
-  pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumStreamer.podspec'
-  pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumInternal.podspec'
+  pod 'ReadiumGCDWebServer', :modular_headers => true
+  pod 'ReadiumAdapterGCDWebServer', '~> 3.5.0'
+  pod 'ReadiumInternal',  '~> 3.5.0'
+  pod 'ReadiumShared',    '~> 3.5.0'
+  pod 'ReadiumStreamer',  '~> 3.5.0'
+  pod 'ReadiumNavigator', '~> 3.5.0'
   pod 'Minizip', modular_headers: true
   ...
 end
 ```
 
+
 Finally, install the pods:
 
 `pod install`
 
 #### Android
 
+##### Breaking change when upgrading from v4 to v5!
+
+This release upgrades the Android native implementation to a newer Readium Kotlin Toolkit.
+Most apps won’t need code changes, but your **Android build configuration** might.
+
+Requirements:
+- **JDK 17** is required to build the Android app (the library targets Java/Kotlin 17).
+- **compileSdkVersion** must be >= `31`.
+
 If you're not using `compileSdkVersion` >= 31 you'll need to update that:
 
 ```groovy
@@ -114,8 +137,35 @@ buildscript {
 ...
 ```
 
+##### Core library desugaring (may be required)
+
+If you see build errors related to missing Java 8+ APIs (commonly `java.time.*`), enable
+core library desugaring in your app:
+
+```groovy
+// android/app/build.gradle
+android {
+  ...
+  compileOptions {
+    coreLibraryDesugaringEnabled true
+  }
+}
+
+dependencies {
+  coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.2"
+}
+```
+
+##### Expo managed workflow
+
+If your app uses Expo managed workflow (native `android/` is generated via `prebuild` / EAS),
+apply the desugaring settings through an Expo config plugin (or `expo-build-properties`) so
+they persist across builds.
+
 ## Usage
 
+### Basic Example
+
 ```tsx
 import React, { useState } from 'react';
 import { ReadiumView } from 'react-native-readium';
@@ -134,6 +184,40 @@ const MyComponent: React.FC = () => {
 }
 ```
 
+### Using Publication Metadata
+
+Access the table of contents, positions, and metadata when the publication is ready:
+
+```tsx
+import React, { useState } from 'react';
+import { ReadiumView } from 'react-native-readium';
+import type { File, PublicationReadyEvent } from 'react-native-readium';
+
+const MyComponent: React.FC = () => {
+  const [file] = useState<File>({
+    url: SOME_LOCAL_FILE_URL,
+  });
+
+  const [toc, setToc] = useState([]);
+
+  const handlePublicationReady = (event: PublicationReadyEvent) => {
+    console.log('Title:', event.metadata.title);
+    console.log('Author:', event.metadata.author);
+    console.log('Table of Contents:', event.tableOfContents);
+    console.log('Positions:', event.positions);
+
+    setToc(event.tableOfContents);
+  };
+
+  return (
+    <ReadiumView
+      file={file}
+      onPublicationReady={handlePublicationReady}
+    />
+  );
+}
+```
+
 [Take a look at the Example App](https://github.com/5-stones/react-native-readium/blob/main/example/src/App.tsx) for a more complex usage example.
 
 ## Supported Formats & DRM
@@ -164,7 +248,7 @@ DRM is not supported at this time. However, there is a clear path to [support it
 | `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) |
 | `style`    | `ViewStyle`          | :white_check_mark: | A traditional style object. |
 | `onLocationChange` | `(locator: Locator) => void` | :white_check_mark: | A callback that fires whenever the location is changed (e.g. the user transitions to a new page)|
-| `onTableOfContents` | `(toc: Link[] \| null) => void` | :white_check_mark: | A callback that fires once the file is parsed and emits the table of contents embedded in the file. Returns `null` or an empty `[]` if no TOC exists. See the [`Link`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/Link.ts) interface for more info. |
+| `onPublicationReady` | `(event: PublicationReadyEvent) => void` | :white_check_mark: | A callback that fires once the publication is loaded and provides access to the table of contents, positions, and metadata. See the [`PublicationReadyEvent`](https://github.com/5-stones/react-native-readium/blob/main/src/interfaces/PublicationReady.ts) interface for details. |
 
 #### :warning: Web vs Native File URLs
 

package/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
   def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['Readium_kotlinVersion']
-  ext.readium_version = '2.4.1'
+  ext.readium_version = '3.1.0'
 
   repositories {
     google()
@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.2'
+    classpath 'com.android.tools.build:gradle:8.5.0'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -28,6 +28,7 @@ def getExtOrIntegerDefault(name) {
 
 android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+  namespace "com.reactnativereadium"
   defaultConfig {
     minSdkVersion 21
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
@@ -40,12 +41,15 @@ android {
       minifyEnabled false
     }
   }
-  lintOptions {
+  lint {
     disable 'GradleCompatible'
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+  kotlinOptions {
+    jvmTarget = "17"
   }
 
   buildFeatures {
@@ -140,46 +144,45 @@ dependencies {
   }
 
   // other deps
-  implementation "androidx.core:core-ktx:1.7.0"
-  implementation "androidx.activity:activity-ktx:1.4.0"
-  implementation "androidx.appcompat:appcompat:1.4.1"
-  implementation "androidx.browser:browser:1.4.0"
+  implementation "androidx.core:core-ktx:1.13.1"
+  implementation "androidx.activity:activity-ktx:1.9.0"
+  implementation "androidx.appcompat:appcompat:1.6.1"
+  implementation "androidx.browser:browser:1.7.0"
   implementation "androidx.cardview:cardview:1.0.0"
-  implementation "androidx.constraintlayout:constraintlayout:2.1.3"
-  implementation "androidx.fragment:fragment-ktx:1.4.0"
-  implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
-  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
-  implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
-  implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-  implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-  implementation "androidx.paging:paging-runtime-ktx:3.1.0"
-  implementation "androidx.recyclerview:recyclerview:1.2.1"
-  implementation "androidx.viewpager2:viewpager2:1.0.0"
-  implementation "androidx.webkit:webkit:1.4.0"
-  implementation "com.google.android.material:material:1.5.0"
+  implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+  implementation "androidx.fragment:fragment-ktx:1.7.1"
+  implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.4"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
+  implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4"
+  implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+  implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+  implementation "androidx.paging:paging-runtime-ktx:3.2.1"
+  implementation "androidx.recyclerview:recyclerview:1.3.2"
+  implementation "androidx.viewpager2:viewpager2:1.1.0"
+  implementation "androidx.webkit:webkit:1.8.0"
+  implementation "com.google.android.material:material:1.11.0"
   implementation "com.jakewharton.timber:timber:5.0.1"
   // AM NOTE: needs to stay this version for now (June 24,2020)
   //noinspection GradleDependency
   implementation "com.squareup.picasso:picasso:2.71828"
   implementation "joda-time:joda-time:2.10.13"
-  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
-  // AM NOTE: needs to stay this version for now (June 24,2020)
-  //noinspection GradleDependency
-  implementation "org.jsoup:jsoup:1.14.3"
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0"
+
+  implementation "org.jsoup:jsoup:1.18.3"
 
   // Room database
-  final roomVersion = "2.4.1"
+  final roomVersion = "2.6.1"
   implementation "androidx.room:room-runtime:$roomVersion"
   implementation "androidx.room:room-ktx:$roomVersion"
   annotationProcessor "androidx.room:room-compiler:$roomVersion"
 
   implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
   //noinspection LifecycleAnnotationProcessorWithJava8
-  annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.4.0"
+  annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.8.4"
 
   testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
   testImplementation "junit:junit:4.13.2"
 
-  androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-  androidTestImplementation "androidx.test:runner:1.4.0"
+  androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+  androidTestImplementation "androidx.test:runner:1.5.2"
 }

package/android/gradle.properties

@@ -1,3 +1,3 @@
-Readium_kotlinVersion=1.5.31
-Readium_compileSdkVersion=31
-Readium_targetSdkVersion=29
+Readium_kotlinVersion=1.9.25
+Readium_compileSdkVersion=35
+Readium_targetSdkVersion=35

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

@@ -1,11 +1,14 @@
 package com.reactnativereadium
 
+import android.util.Log
 import android.view.Choreographer
 import android.widget.FrameLayout
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.events.RCTEventEmitter
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.events.Event
 import com.reactnativereadium.reader.BaseReaderFragment
 import com.reactnativereadium.reader.EpubReaderFragment
 import com.reactnativereadium.reader.ReaderViewModel
@@ -13,18 +16,26 @@ import com.reactnativereadium.reader.VisualReaderFragment
 import com.reactnativereadium.utils.Dimensions
 import com.reactnativereadium.utils.File
 import com.reactnativereadium.utils.LinkOrLocator
+import com.reactnativereadium.utils.MetadataNormalizer
+import com.reactnativereadium.utils.toWritableArray
+import com.reactnativereadium.utils.toWritableMap
 import org.readium.r2.navigator.epub.EpubNavigatorFragment
 import org.readium.r2.navigator.epub.EpubPreferences
-import org.readium.r2.shared.extensions.toMap
 
 class ReadiumView(
   val reactContext: ThemedReactContext
 ) : FrameLayout(reactContext) {
+  companion object {
+    private const val TAG = "ReadiumView"
+  }
+
   var dimensions: Dimensions = Dimensions(0,0)
   var file: File? = null
   var fragment: BaseReaderFragment? = null
   var isViewInitialized: Boolean = false
+  var isFragmentAdded: Boolean = false
   var lateInitSerializedUserPreferences: String? = null
+  private var frameCallback: Choreographer.FrameCallback? = null
 
   fun updateLocation(location: LinkOrLocator) : Boolean {
     if (fragment == null) {
@@ -46,52 +57,93 @@ class ReadiumView(
   }
 
   fun addFragment(frag: BaseReaderFragment) {
+    if (isFragmentAdded) {
+      return
+    }
+
     fragment = frag
+    isFragmentAdded = true
     setupLayout()
     lateInitSerializedUserPreferences?.let { updatePreferencesFromJsonString(it)}
     val activity: FragmentActivity? = reactContext.currentActivity as FragmentActivity?
+
     activity!!.supportFragmentManager
       .beginTransaction()
       .replace(this.id, frag, this.id.toString())
-      .commit()
+      .commitNow()
+
+    // Ensure the fragment's view fills the container
+    frag.view?.layoutParams = FrameLayout.LayoutParams(
+      FrameLayout.LayoutParams.MATCH_PARENT,
+      FrameLayout.LayoutParams.MATCH_PARENT
+    )
+
+    val eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, this.id)
+
+    val dispatch: (String, WritableMap?) -> Unit = { eventName, payload ->
+      if (eventDispatcher != null) {
+        eventDispatcher.dispatchEvent(ReadiumEvent(this.id, eventName, payload))
+      } else {
+        Log.w(TAG, "EventDispatcher is null for view id ${this.id}")
+      }
+    }
 
-    val module = reactContext.getJSModule(RCTEventEmitter::class.java)
     // subscribe to reader events
     frag.channel.receive(frag) { event ->
       when (event) {
         is ReaderViewModel.Event.LocatorUpdate -> {
-          val json = event.locator.toJSON()
-          val payload = Arguments.makeNativeMap(json.toMap())
-          module.receiveEvent(
-            this.id.toInt(),
-            ReadiumViewManager.ON_LOCATION_CHANGE,
-            payload
-          )
+          val payload = event.locator.toWritableMap()
+          dispatch(ReadiumViewManager.ON_LOCATION_CHANGE, payload)
         }
-        is ReaderViewModel.Event.TableOfContentsLoaded -> {
-          val map = event.toc.map { it.toJSON().toMap() }
-          val payload = Arguments.makeNativeMap(mapOf("toc" to map))
-          module.receiveEvent(
-            this.id.toInt(),
-            ReadiumViewManager.ON_TABLE_OF_CONTENTS,
-            payload
-          )
-        }
-        else -> {
-          // do nothing
+        is ReaderViewModel.Event.PublicationReady -> {
+          val payload = Arguments.createMap().apply {
+            putArray("tableOfContents", event.tableOfContents.toWritableArray())
+            putArray("positions", event.positions.map { it.toWritableMap() }.let { list ->
+              Arguments.createArray().apply {
+                list.forEach { pushMap(it) }
+              }
+            })
+            // Use spec-based normalizer to ensure consistent structure
+            putMap("metadata", MetadataNormalizer.normalize(event.metadata))
+          }
+          dispatch(ReadiumViewManager.ON_PUBLICATION_READY, payload)
         }
       }
     }
   }
 
+  // Custom event class for new architecture
+  private class ReadiumEvent(
+    viewTag: Int,
+    private val _eventName: String,
+    private val _eventData: WritableMap?
+  ) : Event<ReadiumEvent>(viewTag) {
+    override fun getEventName(): String = _eventName
+    override fun getEventData(): WritableMap? = _eventData
+  }
+
   private fun setupLayout() {
-    Choreographer.getInstance().postFrameCallback(object : Choreographer.FrameCallback {
+    frameCallback = object : Choreographer.FrameCallback {
       override fun doFrame(frameTimeNanos: Long) {
         manuallyLayoutChildren()
         this@ReadiumView.viewTreeObserver.dispatchOnGlobalLayout()
         Choreographer.getInstance().postFrameCallback(this)
       }
-    })
+    }
+    frameCallback?.let { Choreographer.getInstance().postFrameCallback(it) }
+  }
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    // remove frame callback to avoid leaks/continuous callbacks after view is destroyed
+    frameCallback?.let {
+      try {
+        Choreographer.getInstance().removeFrameCallback(it)
+      } catch (e: Exception) {
+        Log.w(TAG, "Failed to remove frame callback: ${e.message}")
+      }
+    }
+    frameCallback = null
   }
 
   /**
@@ -101,9 +153,17 @@ class ReadiumView(
     // propWidth and propHeight coming from react-native props
     val width = dimensions.width
     val height = dimensions.height
-    this.measure(
-      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-      MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY))
-    this.layout(0, 0, width, height)
+
+    // Measure and layout each child within this container
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      child.measure(
+        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+      )
+      // Position child at (0, 0) within this container, filling the container
+      child.layout(0, 0, width, height)
+    }
   }
 }
+

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

@@ -1,5 +1,6 @@
 package com.reactnativereadium
 
+import android.util.Log
 import com.facebook.react.bridge.*
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.annotations.ReactProp
@@ -35,33 +36,27 @@ class ReadiumViewManager(
         )
       )
       .put(
-        ON_TABLE_OF_CONTENTS,
+        ON_PUBLICATION_READY,
         MapBuilder.of(
           "phasedRegistrationNames",
-          MapBuilder.of("bubbled", ON_TABLE_OF_CONTENTS)
+          MapBuilder.of("bubbled", ON_PUBLICATION_READY)
         )
       )
       .build()
   }
 
-  override fun getCommandsMap(): MutableMap<String, Int> {
-    return MapBuilder.of("create", COMMAND_CREATE)
-  }
-
   override fun receiveCommand(view: ReadiumView, commandId: String?, args: ReadableArray?) {
     super.receiveCommand(view, commandId, args)
-    val reactNativeViewId = args!!.getInt(0)
-    val commandIdInt = commandId!!.toInt()
 
-    when (commandIdInt) {
-      COMMAND_CREATE -> {
+    when (commandId) {
+      "create" -> {
         view.isViewInitialized = true
-
         if (view.file != null) {
           buildForViewIfReady(view)
         }
       }
       else -> {
+        Log.w(TAG, "Unknown command received: $commandId")
       }
     }
   }
@@ -122,17 +117,23 @@ class ReadiumViewManager(
 
   @ReactPropGroup(names = ["width", "height"], customType = "Style")
   fun setStyle(view: ReadiumView?, index: Int, value: Int) {
-    if (index == 0) {
-      view?.dimensions?.width = value
-    }
-    if (index == 1) {
-      view?.dimensions?.height = value
+    if (view != null) {
+      if (index == 0) {
+        view.dimensions.width = value
+      }
+      if (index == 1) {
+        view.dimensions.height = value
+      }
+      buildForViewIfReady(view)
     }
   }
 
   private fun buildForViewIfReady(view: ReadiumView) {
     var file = view.file
-    if (file != null && view.isViewInitialized) {
+    val width = view.dimensions.width
+    val height = view.dimensions.height
+
+    if (file != null && view.isViewInitialized && width > 0 && height > 0) {
       runBlocking {
         svc.openPublication(file.path, file.initialLocation) { fragment ->
           view.addFragment(fragment)
@@ -142,8 +143,8 @@ class ReadiumViewManager(
   }
 
   companion object {
+    private const val TAG = "ReadiumViewManager"
     var ON_LOCATION_CHANGE = "onLocationChange"
-    var ON_TABLE_OF_CONTENTS = "onTableOfContents"
-    var COMMAND_CREATE = 1
+    var ON_PUBLICATION_READY = "onPublicationReady"
   }
 }

package/android/src/main/java/com/reactnativereadium/reader/BaseReaderFragment.kt

@@ -4,20 +4,21 @@ import android.os.Bundle
 import android.view.*
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import com.reactnativereadium.utils.EventChannel
 import com.reactnativereadium.utils.LinkOrLocator
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import org.readium.r2.navigator.*
+import kotlinx.coroutines.launch
+import org.readium.r2.navigator.Navigator
 import org.readium.r2.shared.publication.Locator
-import com.reactnativereadium.utils.EventChannel
-import kotlinx.coroutines.channels.Channel
+import org.readium.r2.shared.publication.services.positions
 
 /*
  * Base reader fragment class
  *
  * Provides common menu items and saves last location on stop.
  */
-@OptIn(ExperimentalDecorator::class)
 abstract class BaseReaderFragment : Fragment() {
   val channel = EventChannel(
     Channel<ReaderViewModel.Event>(Channel.BUFFERED),
@@ -37,7 +38,27 @@ abstract class BaseReaderFragment : Fragment() {
 
     val viewScope = viewLifecycleOwner.lifecycleScope
 
-    channel.send(ReaderViewModel.Event.TableOfContentsLoaded(model.publication.tableOfContents))
+    // Emit PublicationReady event with all metadata
+    viewScope.launch {
+      // positions() is a suspending function that returns List<Locator>
+      val positions = try {
+        model.publication.positions()
+      } catch (e: Exception) {
+        emptyList<Locator>()
+      }
+
+      // Normalize metadata to ensure consistent structure across platforms
+      // This uses spec-based normalization to handle LocalizedStrings and other
+      // platform-specific serialization differences
+      channel.send(
+        ReaderViewModel.Event.PublicationReady(
+          tableOfContents = model.publication.tableOfContents,
+          positions = positions,
+          metadata = model.publication.metadata
+        )
+      )
+    }
+
     navigator.currentLocator
       .onEach { channel.send(ReaderViewModel.Event.LocatorUpdate(it)) }
       .launchIn(viewScope)
@@ -53,7 +74,7 @@ abstract class BaseReaderFragment : Fragment() {
     var locator: Locator? = null
     when (location) {
       is LinkOrLocator.Link -> {
-        locator = navigator.publication.locatorFromLink(location.link)
+        locator = model.publication.locatorFromLink(location.link)
       }
       is LinkOrLocator.Locator -> {
         locator = location.locator