Fix custom EPUB reading order

Author: lbeus

CHANGELOG.md

@@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file. Take a look
 #### Navigator
 
 * PDF documents are now opened off the main thread, preventing UI freezes with large files.
+* Fixed providing a custom reading order to the `EPUBNavigatorViewController` (contributed by [@lbeus](https://github.com/readium/swift-toolkit/pull/694)).
 
 
 ## [3.6.0]

Sources/Navigator/EPUB/EPUBNavigatorViewController.swift

@@ -296,14 +296,15 @@ open class EPUBNavigatorViewController: InputObservableViewController,
 
         let viewModel = try EPUBNavigatorViewModel(
             publication: publication,
+            readingOrder: readingOrder ?? publication.readingOrder,
             config: config,
             httpServer: httpServer
         )
 
         self.init(
             viewModel: viewModel,
             initialLocation: initialLocation,
-            readingOrder: readingOrder ?? publication.readingOrder,
+            readingOrder: viewModel.readingOrder,
             positionsByReadingOrder:
             // Positions and total progression only make sense in the context
             // of the publication's actual reading order. Therefore when

Sources/Navigator/EPUB/EPUBNavigatorViewModel.swift

@@ -38,10 +38,11 @@ final class EPUBNavigatorViewModel: Loggable {
     /// `httpServer`. This is used to serve custom font files, for example.
     @Atomic private var servedFiles: [FileURL: HTTPURL] = [:]
 
-    var readingOrder: ReadingOrder { publication.readingOrder }
+    let readingOrder: ReadingOrder
 
     convenience init(
         publication: Publication,
+        readingOrder: ReadingOrder,
         config: EPUBNavigatorViewController.Configuration,
         httpServer: HTTPServer
     ) throws {
@@ -55,6 +56,7 @@ final class EPUBNavigatorViewModel: Loggable {
 
         try self.init(
             publication: publication,
+            readingOrder: readingOrder,
             config: config,
             httpServer: httpServer,
             publicationEndpoint: publicationEndpoint,
@@ -89,6 +91,7 @@ final class EPUBNavigatorViewModel: Loggable {
 
     private init(
         publication: Publication,
+        readingOrder: ReadingOrder,
         config: EPUBNavigatorViewController.Configuration,
         httpServer: HTTPServer?,
         publicationEndpoint: HTTPServerEndpoint?,
@@ -123,6 +126,7 @@ final class EPUBNavigatorViewModel: Loggable {
         }
 
         self.publication = publication
+        self.readingOrder = readingOrder
         self.config = config
         editingActions = EditingActionsController(
             actions: config.editingActions,