@fluid-topics/ft-reader-context 1.1.99 → 1.1.101

package/build/store/FtReaderStateManager.d.ts

@@ -9,6 +9,8 @@ export declare class FtReaderStateManager {
     clusteringHelper?: ClusteringHelper;
     service?: FtReaderService;
     errorHandler?: (e: Error) => void;
+    private _loaded;
+    loaded(): Promise<void>;
     constructor(store: FtReaderReduxStore, serviceProvider: () => Promise<FtReaderService>, clusteringHelperProvider?: (() => ClusteringHelper) | undefined);
     initService(serviceProvider: () => Promise<FtReaderService>): Promise<void>;
     setMapId(mapId?: string): Promise<void>;

package/build/store/FtReaderStateManager.js

@@ -1,4 +1,4 @@
-import { CanceledPromiseError, ClusteringHelper, Debouncer, waitFor } from "@fluid-topics/ft-wc-utils";
+import { CanceledPromiseError, ClusteringHelper, Debouncer, waitFor, waitUntil } from "@fluid-topics/ft-wc-utils";
 import { createReaderStore } from "./redux";
 import { FtOfficialReaderService } from "./utils/FtOfficialReaderService";
 import { ftAppInfoStore } from "@fluid-topics/ft-app-context";
@@ -6,10 +6,14 @@ export class FtReaderStateManager {
     static build(id, serviceProvider) {
         return new FtReaderStateManager(createReaderStore(id.trim() || "context"), serviceProvider !== null && serviceProvider !== void 0 ? serviceProvider : FtOfficialReaderService.build);
     }
+    loaded() {
+        return waitUntil(() => this._loaded);
+    }
     constructor(store, serviceProvider, clusteringHelperProvider) {
         this.store = store;
         this.clusteringHelperProvider = clusteringHelperProvider;
         this.metadataForSwitchToRelatives = new Set();
+        this._loaded = false;
         this.loadDebouncer = new Debouncer(10);
         this.initService(serviceProvider);
     }
@@ -34,6 +38,7 @@ export class FtReaderStateManager {
         return waitFor(() => this.service);
     }
     async navigateToTopic(tocId, section, pageNumber) {
+        await this.loaded();
         const service = await this.awaitService();
         const page = await (pageNumber != null ? service.getPage(pageNumber) : service.getPageByTocId(tocId !== null && tocId !== void 0 ? tocId : "root"));
         this.store.actions.currentPage(page);
@@ -51,6 +56,7 @@ export class FtReaderStateManager {
         return nonRootTocId;
     }
     async navigateToPage(pageNumber) {
+        await this.loaded();
         const service = await this.awaitService();
         let page = await service.getPage(pageNumber);
         this.store.actions.currentPage(page);
@@ -66,6 +72,7 @@ export class FtReaderStateManager {
     }
     clear() {
         var _a;
+        this._loaded = false;
         this.store.actions.configuration(undefined);
         this.store.actions.map(undefined);
         this.store.actions.toc(undefined);
@@ -89,11 +96,11 @@ export class FtReaderStateManager {
                 (_c = this.service) === null || _c === void 0 ? void 0 : _c.getToc().then(toc => this.store.actions.toc(toc)),
                 (_d = this.service) === null || _d === void 0 ? void 0 : _d.getPagesToc().then(pagesToc => this.store.actions.pagesToc(pagesToc)),
                 (_e = this.service) === null || _e === void 0 ? void 0 : _e.getPaginationConfiguration().then(conf => this.store.actions.paginationConfiguration(conf)),
-            ]).then(() => {
-                if (this.metadataForSwitchToRelatives.size > 0) {
-                    this.fetchRelatives();
-                }
-            });
+            ]);
+            if (this.metadataForSwitchToRelatives.size > 0) {
+                this.fetchRelatives();
+            }
+            this._loaded = true;
         }
         catch (e) {
             if (this.errorHandler && !(e instanceof CanceledPromiseError)) {
@@ -136,6 +143,7 @@ export class FtReaderStateManager {
     }
     async navigateToRelativeTopicIfFound(topicPivotMetadataValue) {
         var _a, _b, _c;
+        await this.loaded();
         const relativeTopicPivotMetadata = await waitFor(() => { var _a; return (_a = this.store.getState().configuration) === null || _a === void 0 ? void 0 : _a.relativeTopicPivotMetadata; });
         const mapId = this.store.getState().mapId;
         const service = await this.awaitService();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-reader-context",
-  "version": "1.1.99",
+  "version": "1.1.101",
   "description": "Context block for integrated reader components",
   "keywords": [
     "Lit"
@@ -19,13 +19,13 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.1.99",
-    "@fluid-topics/ft-wc-utils": "1.1.99",
+    "@fluid-topics/ft-app-context": "1.1.101",
+    "@fluid-topics/ft-wc-utils": "1.1.101",
     "@reduxjs/toolkit": "^1.6.2",
     "lit": "3.1.0"
   },
   "devDependencies": {
     "@fluid-topics/public-api": "1.0.73"
   },
-  "gitHead": "4f91ba9bad271e32aa24473716e9dfb3dff630bf"
+  "gitHead": "2d444ace3306098342639937b95d84f13f24cb2d"
 }