Merge 8c4e191 into cc7207e

Author: wu-hui

packages/firestore/src/local/indexeddb_persistence.ts

@@ -966,7 +966,7 @@ export class IndexedDbPersistence implements Persistence {
           return this.shutdown();
         });
       };
-      this.window.addEventListener('unload', this.windowUnloadHandler);
+      this.window.addEventListener('pagehide', this.windowUnloadHandler);
     }
   }
 
@@ -976,7 +976,7 @@ export class IndexedDbPersistence implements Persistence {
         typeof this.window?.removeEventListener === 'function',
         "Expected 'window.removeEventListener' to be a function"
       );
-      this.window!.removeEventListener('unload', this.windowUnloadHandler);
+      this.window!.removeEventListener('pagehide', this.windowUnloadHandler);
       this.windowUnloadHandler = null;
     }
   }

packages/firestore/src/local/shared_client_state.ts

@@ -613,7 +613,7 @@ export class WebStorageSharedClientState implements SharedClientState {
 
     // Register a window unload hook to remove the client metadata entry from
     // WebStorage even if `shutdown()` was not called.
-    this.window.addEventListener('unload', () => this.shutdown());
+    this.window.addEventListener('pagehide', () => this.shutdown());
 
     this.started = true;
   }