@swiftbrowser/web 0.10.0 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftbrowser/web",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "type": "module",
   "description": "SwiftBrowser web renderer and dev server: applies render ops from a Swift/Wasm app to the DOM inside an iPhone frame.",
   "repository": {

package/src/browserHistory.ts

@@ -54,10 +54,19 @@ function shown(win: Window, el: HTMLElement): boolean {
   return win.getComputedStyle(el).visibility !== 'hidden';
 }
 
+/** How long a back the browser made waits for the app to pop a level before what it shows is recorded as it is. */
+const DISMISS_WAIT_MS = 1000;
+
 export class BrowserHistory {
   private readonly win: Window;
-  /** Levels the latest `popstate` still asks to dismiss, one commit at a time. */
-  private pendingPops = 0;
+  /**
+   * A back the browser made, while the app pops to it: the depth the entry
+   * names, the depth the latest dismissal started from, and until when the
+   * app's pop is waited for. A pop can take more than one commit (a compact
+   * split view clears its sidebar selection first, and the detail goes on
+   * the next), so a commit that still shows the level is not a new one.
+   */
+  private dismissing: { target: number; from: number; until: number } | null = null;
   /** `popstate` events to ignore: the ones our own `history.go` causes. */
   private ignorePops = 0;
   /**
@@ -205,6 +214,15 @@ export class BrowserHistory {
     return top ? Number(top.dataset['sbDepth'] ?? '0') || 0 : 0;
   }
 
+  /** Dismisses the level above `depth` for the back in progress, and waits for the app's pop. */
+  private dismissFrom(depth: number): void {
+    const dismissing = this.dismissing;
+    if (!dismissing) return;
+    dismissing.from = depth;
+    dismissing.until = performance.now() + DISMISS_WAIT_MS;
+    if (!this.dismissOne()) this.dismissing = null;
+  }
+
   /** Asks the app to dismiss one level: the top sheet when nothing is pushed inside it, else the deepest visible stack's top screen. */
   private dismissOne(): boolean {
     const sheets = this.sheets();
@@ -282,13 +300,16 @@ export class BrowserHistory {
     const depth = this.depth();
     const recorded = this.recorded();
     const selection = this.selection();
-    if (this.pendingPops > 0) {
+    const dismissing = this.dismissing;
+    if (dismissing) {
       // Dismissing for a `popstate`: the entry already names the target depth.
-      if (depth > recorded) {
-        if (!this.dismissOne()) this.pendingPops = 0;
-        else this.pendingPops -= 1;
-      } else this.pendingPops = 0;
-      return;
+      if (depth > dismissing.target && performance.now() < dismissing.until) {
+        // The latest dismissal landed: the next level. Otherwise the app has not popped yet.
+        if (depth < dismissing.from) this.dismissFrom(depth);
+        return;
+      }
+      // Arrived, or the app kept the level (it is then recorded as any other).
+      this.dismissing = null;
     }
     if (depth > recorded) {
       // Under our own pending `go`, a push would land relative to wherever the browser is when it runs (and
@@ -326,11 +347,12 @@ export class BrowserHistory {
     // The browser moved on its own (a swipe, a button): keep painting past its transition.
     this.renderer.keepRepainting();
     const depth = this.depth();
+    // A move the browser makes replaces any back still in progress.
+    this.dismissing = null;
     if (target.sbDepth < depth) {
-      // Back: dismiss one level now, the rest as each commit lands.
-      this.pendingPops = depth - target.sbDepth;
-      if (!this.dismissOne()) this.pendingPops = 0;
-      else this.pendingPops -= 1;
+      // Back: dismiss one level now, the rest as each pop lands.
+      this.dismissing = { target: target.sbDepth, from: depth, until: 0 };
+      this.dismissFrom(depth);
     } else if (target.sbDepth > depth) {
       // Forward: a screen cannot be re-pushed; return to the entry that matches.
       this.go(depth - target.sbDepth, depth);