@readium/navigator 2.5.4 → 2.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readium/navigator",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "type": "module",
   "description": "Next generation SDK for publications in Web Apps",
   "author": "readium",

package/src/epub/EpubNavigator.ts

@@ -81,6 +81,7 @@ export class EpubNavigator extends VisualNavigator implements Configurable<Confi
     private _css: ReadiumCSS;
     private _preferencesEditor: EpubPreferencesEditor | null = null;
     private _injector: Injector | null = null;
+    private _isNavigating = false;
     private readonly _readiumRulesPromise: Promise<IInjectableRule[]>;
     private readonly _injectablesConfig: IInjectablesConfig;
     private readonly _contentProtection: IContentProtectionConfig;
@@ -648,6 +649,10 @@ export class EpubNavigator extends VisualNavigator implements Configurable<Confi
                     }
                 }
             await this.apply();
+            // On the initial forward walk each fresh iframe load fires
+            // positionChanged via _pong; on back-then-forward to an
+            // already-loaded frame no _pong fires, so dispatch explicitly here.
+            this.listeners.positionChanged(this.currentLocation);
             return true;
         }
 
@@ -754,33 +759,45 @@ export class EpubNavigator extends VisualNavigator implements Configurable<Confi
     }
 
     public goBackward(_: boolean, cb: (ok: boolean) => void): void {
+        if(this._isNavigating) { cb(false); return; }
+        this._isNavigating = true;
         if(this._layout === Layout.fixed) {
-            this.changeResource(-1);
-            cb(true);
+            this.changeResource(-1).then((ok) => {
+                this._isNavigating = false;
+                cb(ok);
+            });
         } else {
             this._cframes[0]?.msg?.send("go_prev", undefined, async (ack) => {
-                if(ack)
-                    // OK
+                if(ack) {
+                    this._isNavigating = false;
                     cb(true);
-                else
-                    // Need to change resources because we're at the beginning of the current one
-                    cb(await this.changeResource(-1));
+                } else {
+                    const ok = await this.changeResource(-1);
+                    this._isNavigating = false;
+                    cb(ok);
+                }
             });
         }
     }
 
     public goForward(_: boolean, cb: (ok: boolean) => void): void {
+        if(this._isNavigating) { cb(false); return; }
+        this._isNavigating = true;
         if(this._layout === Layout.fixed) {
-            this.changeResource(1);
-            cb(true);
+            this.changeResource(1).then((ok) => {
+                this._isNavigating = false;
+                cb(ok);
+            });
         } else {
             this._cframes[0]?.msg?.send("go_next", undefined, async (ack) => {
-                if(ack)
-                    // OK
+                if(ack) {
+                    this._isNavigating = false;
                     cb(true);
-                else
-                    // Need to change resources because we're at the end of the current one
-                    cb(await this.changeResource(1));
+                } else {
+                    const ok = await this.changeResource(1);
+                    this._isNavigating = false;
+                    cb(ok);
+                }
             });
         }
     }
@@ -903,8 +920,14 @@ export class EpubNavigator extends VisualNavigator implements Configurable<Confi
             return cb(this.listeners.handleLocator(locator));
         }
 
+        if(this._isNavigating) { cb(false); return; }
+        this._isNavigating = true;
+
         this.currentLocation = this.positions.find(p => p.href === link!.href)!;
-        this.apply().then(() => this.loadLocator(locator, (ok) => cb(ok))).then(() => {
+        this.apply().then(() => this.loadLocator(locator, (ok) => {
+            this._isNavigating = false;
+            cb(ok);
+        })).then(() => {
             // Now that we've gone to the right locator, we can attach the listeners.
             // Doing this only at this stage reduces janky UI with multiple locator updates.
             this.attachListener();

package/src/epub/frame/FrameManager.ts

@@ -115,6 +115,9 @@ export class FrameManager {
         this.frame.style.opacity = "0";
         this.frame.style.pointerEvents = "none";
         this.hidden = true;
+        // Return focus to the parent document so keyboard events aren't silently
+        // swallowed by a hidden iframe whose comms channel has been halted.
+        this.frame.blur();
         if(this.frame.parentElement) {
             if(this.comms === undefined || !this.comms.ready) return;
             return new Promise((res, _) => {

package/src/epub/fxl/FXLFrameManager.ts

@@ -199,6 +199,9 @@ export class FXLFrameManager {
     async unfocus(): Promise<void> {
         if(this.frame.parentElement) {
             if(this.comms === undefined) return;
+            // Return focus to the parent document so keyboard events aren't silently
+            // swallowed by an off-screen iframe whose comms channel has been halted.
+            this.frame.blur();
             return new Promise((res, _) => {
                 this.comms?.send("unfocus", undefined, (_: boolean) => {
                     this.comms?.halt();

package/src/webpub/WebPubNavigator.ts

@@ -72,6 +72,7 @@ export class WebPubNavigator extends VisualNavigator implements Configurable<Web
     private _css: WebPubCSS;
     private _preferencesEditor: WebPubPreferencesEditor | null = null;
     private readonly _injector: Injector | null = null;
+    private _isNavigating = false;
     private readonly _contentProtection: IContentProtectionConfig;
     private readonly _keyboardPeripherals: IKeyboardPeripheralsConfig;
     private readonly _navigatorProtector: NavigatorProtector | null = null;
@@ -463,14 +464,20 @@ export class WebPubNavigator extends VisualNavigator implements Configurable<Web
     }
 
     goBackward(_animated: boolean, cb: (ok: boolean) => void): void {
-        this.changeResource(-1).then((success) => {
-            cb(success);
+        if(this._isNavigating) { cb(false); return; }
+        this._isNavigating = true;
+        this.changeResource(-1).then((ok) => {
+            this._isNavigating = false;
+            cb(ok);
         });
     }
 
     goForward(_animated: boolean, cb: (ok: boolean) => void): void {
-        this.changeResource(1).then((success) => {
-            cb(success);
+        if(this._isNavigating) { cb(false); return; }
+        this._isNavigating = true;
+        this.changeResource(1).then((ok) => {
+            this._isNavigating = false;
+            cb(ok);
         });
     }
 
@@ -581,8 +588,14 @@ export class WebPubNavigator extends VisualNavigator implements Configurable<Web
             this.currentIndex = index;
         }
 
+        if(this._isNavigating) { cb(false); return; }
+        this._isNavigating = true;
+
         this.currentLocation = this.createCurrentLocator();
-        this.apply().then(() => this.loadLocator(locator, (ok) => cb(ok))).then(() => {
+        this.apply().then(() => this.loadLocator(locator, (ok) => {
+            this._isNavigating = false;
+            cb(ok);
+        })).then(() => {
             // Now that we've gone to the right locator, we can attach the listeners.
             // Doing this only at this stage reduces janky UI with multiple locator updates.
             this.attachListener();

package/types/src/epub/EpubNavigator.d.ts

@@ -50,6 +50,7 @@ export declare class EpubNavigator extends VisualNavigator implements Configurab
     private _css;
     private _preferencesEditor;
     private _injector;
+    private _isNavigating;
     private readonly _readiumRulesPromise;
     private readonly _injectablesConfig;
     private readonly _contentProtection;

package/types/src/webpub/WebPubNavigator.d.ts

@@ -44,6 +44,7 @@ export declare class WebPubNavigator extends VisualNavigator implements Configur
     private _css;
     private _preferencesEditor;
     private readonly _injector;
+    private _isNavigating;
     private readonly _contentProtection;
     private readonly _keyboardPeripherals;
     private readonly _navigatorProtector;