Contain VisitOption munging within Navigator

domchristie · Sep 20, 2023 · 3e49d80 · 3e49d80
1 parent 4eed166
commit 3e49d80
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/core/drive/navigator.js b/src/core/drive/navigator.js
@@ -12,8 +12,8 @@ export class Navigator {
   proposeVisit(location, options = {}) {
     if (this.delegate.allowsVisitingLocation(location, options)) {
       if (locationIsVisitable(location, this.view.snapshot.rootLocation)) {
-        this.withVisitOptions(options, () => {
-          this.delegate.visitProposedToLocation(location, options)
+        this.withTransferableVisitOptions(options, (transferableOptions) => {
+          this.delegate.visitProposedToLocation(location, transferableOptions)
         })
       } else {
         window.location.href = location.toString()
@@ -160,9 +160,14 @@ export class Navigator {
 
   // Private
 
-  withVisitOptions(options, callback) {
+  withTransferableVisitOptions(options, callback) {
     this.currentVisitOptions = options
-    callback.call(this)
+    callback.call(this, this.sanitizeVisitOptionsForTransfer(options))
     this.currentVisitOptions = {}
   }
+
+  sanitizeVisitOptionsForTransfer(options) {
+    const { initiator, referrer, visitCachedSnapshot, ...rest } = options
+    return rest
+  }
 }
diff --git a/src/core/session.js b/src/core/session.js
@@ -180,7 +180,7 @@ export class Session {
 
   visitProposedToLocation(location, options) {
     extendURLWithDeprecatedProperties(location)
-    this.adapter.visitProposedToLocation(location, this.sanitizeVisitOptionsForTransfer(options))
+    this.adapter.visitProposedToLocation(location, options)
   }
 
   // Visit delegate
@@ -404,11 +404,6 @@ export class Session {
     }
   }
 
-  sanitizeVisitOptionsForTransfer(options) {
-    const { initiator, referrer, visitCachedSnapshot, ...rest } = options
-    return rest
-  }
-
   // Private
 
   getActionForLink(link) {