Reset visibilitywatcher on soft nav

GoogleChrome · Dec 15, 2023 · 42b8e47 · 42b8e47
1 parent 1e72319
commit 42b8e47
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/lib/getVisibilityWatcher.ts b/src/lib/getVisibilityWatcher.ts
@@ -61,7 +61,10 @@ const removeChangeListeners = () => {
   removeEventListener('prerenderingchange', onVisibilityUpdate, true);
 };
 
-export const getVisibilityWatcher = () => {
+export const getVisibilityWatcher = (reset = false) => {
+  if (reset) {
+    firstHiddenTime = -1;
+  }
   if (firstHiddenTime < 0) {
     // If the document is hidden when this code runs, assume it was hidden
     // since navigation start. This isn't a perfect heuristic, but it's the

diff --git a/src/onFCP.ts b/src/onFCP.ts
@@ -48,7 +48,7 @@ export const onFCP = (onReport: FCPReportCallback, opts?: ReportOpts) => {
   let metricNavStartTime = 0;
 
   whenActivated(() => {
-    const visibilityWatcher = getVisibilityWatcher();
+    let visibilityWatcher = getVisibilityWatcher();
     let metric = initMetric('FCP');
     let report: ReturnType<typeof bindReporter>;
 
@@ -64,6 +64,7 @@ export const onFCP = (onReport: FCPReportCallback, opts?: ReportOpts) => {
         opts!.reportAllChanges
       );
       if (navigation === 'soft-navigation') {
+        visibilityWatcher = getVisibilityWatcher(true);
         const softNavEntry = navigationId
           ? getSoftNavigationEntry(navigationId)
           : null;

diff --git a/src/onFID.ts b/src/onFID.ts
@@ -54,14 +54,17 @@ export const onFID = (onReport: FIDReportCallback, opts?: ReportOpts) => {
   const softNavsEnabled = softNavs(opts);
 
   whenActivated(() => {
-    const visibilityWatcher = getVisibilityWatcher();
+    let visibilityWatcher = getVisibilityWatcher();
     let metric = initMetric('FID');
     let report: ReturnType<typeof bindReporter>;
 
     const initNewFIDMetric = (
       navigation?: Metric['navigationType'],
       navigationId?: string
     ) => {
+      if (navigation === 'soft-navigation') {
+        visibilityWatcher = getVisibilityWatcher(true);
+      }
       metric = initMetric('FID', 0, navigation, navigationId);
       report = bindReporter(
         onReport,

diff --git a/src/onLCP.ts b/src/onLCP.ts
@@ -55,7 +55,7 @@ export const onLCP = (onReport: LCPReportCallback, opts?: ReportOpts) => {
   let metricNavStartTime = 0;
 
   whenActivated(() => {
-    const visibilityWatcher = getVisibilityWatcher();
+    let visibilityWatcher = getVisibilityWatcher();
     let metric = initMetric('LCP');
     let report: ReturnType<typeof bindReporter>;
 
@@ -72,6 +72,7 @@ export const onLCP = (onReport: LCPReportCallback, opts?: ReportOpts) => {
       );
       reportedMetric = false;
       if (navigation === 'soft-navigation') {
+        visibilityWatcher = getVisibilityWatcher(true);
         const softNavEntry = getSoftNavigationEntry(navigationId);
         metricNavStartTime =
           softNavEntry && softNavEntry.startTime ? softNavEntry.startTime : 0;