@hotwired/turbo 7.2.0 → 7.2.2

package/dist/turbo.es2017-esm.js

@@ -1,5 +1,5 @@
 /*
-Turbo 7.2.0
+Turbo 7.2.2
 Copyright © 2022 37signals LLC
  */
 (function () {
@@ -128,11 +128,7 @@ class FrameElement extends HTMLElement {
         this.delegate.disconnect();
     }
     reload() {
-        const { src } = this;
-        this.removeAttribute("complete");
-        this.src = null;
-        this.src = src;
-        return this.loaded;
+        return this.delegate.sourceURLReloaded();
     }
     attributeChangedCallback(name) {
         if (name == "loading") {
@@ -918,6 +914,7 @@ class FormSubmitObserver {
                     submissionDoesNotTargetIFrame(form, submitter) &&
                     this.delegate.willSubmitForm(form, submitter)) {
                     event.preventDefault();
+                    event.stopImmediatePropagation();
                     this.delegate.formSubmitted(form, submitter);
                 }
             }
@@ -1054,6 +1051,48 @@ class FrameView extends View {
     }
 }
 
+class LinkInterceptor {
+    constructor(delegate, element) {
+        this.clickBubbled = (event) => {
+            if (this.respondsToEventTarget(event.target)) {
+                this.clickEvent = event;
+            }
+            else {
+                delete this.clickEvent;
+            }
+        };
+        this.linkClicked = ((event) => {
+            if (this.clickEvent && this.respondsToEventTarget(event.target) && event.target instanceof Element) {
+                if (this.delegate.shouldInterceptLinkClick(event.target, event.detail.url, event.detail.originalEvent)) {
+                    this.clickEvent.preventDefault();
+                    event.preventDefault();
+                    this.delegate.linkClickIntercepted(event.target, event.detail.url, event.detail.originalEvent);
+                }
+            }
+            delete this.clickEvent;
+        });
+        this.willVisit = ((_event) => {
+            delete this.clickEvent;
+        });
+        this.delegate = delegate;
+        this.element = element;
+    }
+    start() {
+        this.element.addEventListener("click", this.clickBubbled);
+        document.addEventListener("turbo:click", this.linkClicked);
+        document.addEventListener("turbo:before-visit", this.willVisit);
+    }
+    stop() {
+        this.element.removeEventListener("click", this.clickBubbled);
+        document.removeEventListener("turbo:click", this.linkClicked);
+        document.removeEventListener("turbo:before-visit", this.willVisit);
+    }
+    respondsToEventTarget(target) {
+        const element = target instanceof Element ? target : target instanceof Node ? target.parentElement : null;
+        return element && element.closest("turbo-frame, html") == this.element;
+    }
+}
+
 class LinkClickObserver {
     constructor(delegate, eventTarget) {
         this.started = false;
@@ -1118,13 +1157,13 @@ function doesNotTargetIFrame(anchor) {
 class FormLinkClickObserver {
     constructor(delegate, element) {
         this.delegate = delegate;
-        this.linkClickObserver = new LinkClickObserver(this, element);
+        this.linkInterceptor = new LinkClickObserver(this, element);
     }
     start() {
-        this.linkClickObserver.start();
+        this.linkInterceptor.start();
     }
     stop() {
-        this.linkClickObserver.stop();
+        this.linkInterceptor.stop();
     }
     willFollowLinkToLocation(link, location, originalEvent) {
         return (this.delegate.willSubmitFormLinkToLocation(link, location, originalEvent) &&
@@ -1646,10 +1685,11 @@ class Visit {
         this.delegate = delegate;
         this.location = location;
         this.restorationIdentifier = restorationIdentifier || uuid();
-        const { action, historyChanged, referrer, snapshotHTML, response, visitCachedSnapshot, willRender, updateHistory, shouldCacheSnapshot, acceptsStreamResponse, } = Object.assign(Object.assign({}, defaultOptions), options);
+        const { action, historyChanged, referrer, snapshot, snapshotHTML, response, visitCachedSnapshot, willRender, updateHistory, shouldCacheSnapshot, acceptsStreamResponse, } = Object.assign(Object.assign({}, defaultOptions), options);
         this.action = action;
         this.historyChanged = historyChanged;
         this.referrer = referrer;
+        this.snapshot = snapshot;
         this.snapshotHTML = snapshotHTML;
         this.response = response;
         this.isSamePage = this.delegate.locationWithActionIsSamePage(this.location, this.action);
@@ -1937,7 +1977,7 @@ class Visit {
     }
     cacheSnapshot() {
         if (!this.snapshotCached) {
-            this.view.cacheSnapshot().then((snapshot) => snapshot && this.visitCachedSnapshot(snapshot));
+            this.view.cacheSnapshot(this.snapshot).then((snapshot) => snapshot && this.visitCachedSnapshot(snapshot));
             this.snapshotCached = true;
         }
     }
@@ -2045,10 +2085,9 @@ class BrowserAdapter {
         }
     }
     reload(reason) {
+        var _a;
         dispatch("turbo:reload", { detail: reason });
-        if (!this.location)
-            return;
-        window.location.href = this.location.toString();
+        window.location.href = ((_a = this.location) === null || _a === void 0 ? void 0 : _a.toString()) || window.location.href;
     }
     get navigator() {
         return this.session.navigator;
@@ -2083,24 +2122,24 @@ class FrameRedirector {
     constructor(session, element) {
         this.session = session;
         this.element = element;
-        this.linkClickObserver = new LinkClickObserver(this, element);
+        this.linkInterceptor = new LinkInterceptor(this, element);
         this.formSubmitObserver = new FormSubmitObserver(this, element);
     }
     start() {
-        this.linkClickObserver.start();
+        this.linkInterceptor.start();
         this.formSubmitObserver.start();
     }
     stop() {
-        this.linkClickObserver.stop();
+        this.linkInterceptor.stop();
         this.formSubmitObserver.stop();
     }
-    willFollowLinkToLocation(element, location, event) {
-        return this.shouldRedirect(element) && this.frameAllowsVisitingLocation(element, location, event);
+    shouldInterceptLinkClick(element, _location, _event) {
+        return this.shouldRedirect(element);
     }
-    followedLinkToLocation(element, url) {
+    linkClickIntercepted(element, url, event) {
         const frame = this.findFrameElement(element);
         if (frame) {
-            frame.delegate.followedLinkToLocation(element, url);
+            frame.delegate.linkClickIntercepted(element, url, event);
         }
     }
     willSubmitForm(element, submitter) {
@@ -2114,14 +2153,6 @@ class FrameRedirector {
             frame.delegate.formSubmitted(element, submitter);
         }
     }
-    frameAllowsVisitingLocation(target, { href: url }, originalEvent) {
-        const event = dispatch("turbo:click", {
-            target,
-            detail: { url, originalEvent },
-            cancelable: true,
-        });
-        return !event.defaultPrevented;
-    }
     shouldSubmit(form, submitter) {
         var _a;
         const action = getAction(form, submitter);
@@ -2748,10 +2779,10 @@ class PageView extends View {
     clearSnapshotCache() {
         this.snapshotCache.clear();
     }
-    async cacheSnapshot() {
-        if (this.shouldCacheSnapshot) {
+    async cacheSnapshot(snapshot = this.snapshot) {
+        if (snapshot.isCacheable) {
             this.delegate.viewWillCacheSnapshot();
-            const { snapshot, lastRenderedLocation: location } = this;
+            const { lastRenderedLocation: location } = this;
             await nextEventLoopTick();
             const cachedSnapshot = snapshot.clone();
             this.snapshotCache.put(location, cachedSnapshot);
@@ -2764,9 +2795,6 @@ class PageView extends View {
     get snapshot() {
         return PageSnapshot.fromElement(this.element);
     }
-    get shouldCacheSnapshot() {
-        return this.snapshot.isCacheable;
-    }
 }
 
 class Preloader {
@@ -3240,7 +3268,7 @@ class FrameController {
         this.view = new FrameView(this, this.element);
         this.appearanceObserver = new AppearanceObserver(this, this.element);
         this.formLinkClickObserver = new FormLinkClickObserver(this, this.element);
-        this.linkClickObserver = new LinkClickObserver(this, this.element);
+        this.linkInterceptor = new LinkInterceptor(this, this.element);
         this.restorationIdentifier = uuid();
         this.formSubmitObserver = new FormSubmitObserver(this, this.element);
     }
@@ -3254,7 +3282,7 @@ class FrameController {
                 this.loadSourceURL();
             }
             this.formLinkClickObserver.start();
-            this.linkClickObserver.start();
+            this.linkInterceptor.start();
             this.formSubmitObserver.start();
         }
     }
@@ -3263,7 +3291,7 @@ class FrameController {
             this.connected = false;
             this.appearanceObserver.stop();
             this.formLinkClickObserver.stop();
-            this.linkClickObserver.stop();
+            this.linkInterceptor.stop();
             this.formSubmitObserver.stop();
         }
     }
@@ -3282,6 +3310,15 @@ class FrameController {
             this.loadSourceURL();
         }
     }
+    sourceURLReloaded() {
+        const { src } = this.element;
+        this.ignoringChangesToAttribute("complete", () => {
+            this.element.removeAttribute("complete");
+        });
+        this.element.src = null;
+        this.element.src = src;
+        return this.element.loaded;
+    }
     completeChanged() {
         if (this.isIgnoringChangesTo("complete"))
             return;
@@ -3343,18 +3380,18 @@ class FrameController {
         this.loadSourceURL();
     }
     willSubmitFormLinkToLocation(link) {
-        return link.closest("turbo-frame") == this.element && this.shouldInterceptNavigation(link);
+        return this.shouldInterceptNavigation(link);
     }
     submittedFormLinkToLocation(link, _location, form) {
         const frame = this.findFrameElement(link);
         if (frame)
             form.setAttribute("data-turbo-frame", frame.id);
     }
-    willFollowLinkToLocation(element, location, event) {
-        return this.shouldInterceptNavigation(element) && this.frameAllowsVisitingLocation(element, location, event);
+    shouldInterceptLinkClick(element, _location, _event) {
+        return this.shouldInterceptNavigation(element);
     }
-    followedLinkToLocation(element, location) {
-        this.navigateFrame(element, location.href);
+    linkClickIntercepted(element, location) {
+        this.navigateFrame(element, location);
     }
     willSubmitForm(element, submitter) {
         return element.closest("turbo-frame") == this.element && this.shouldInterceptNavigation(element, submitter);
@@ -3402,7 +3439,7 @@ class FrameController {
     }
     formSubmissionSucceededWithResponse(formSubmission, response) {
         const frame = this.findFrameElement(formSubmission.formElement, formSubmission.submitter);
-        this.proposeVisitIfNavigatedWithAction(frame, formSubmission.formElement, formSubmission.submitter);
+        frame.delegate.proposeVisitIfNavigatedWithAction(frame, formSubmission.formElement, formSubmission.submitter);
         frame.delegate.loadResponse(response);
     }
     formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
@@ -3450,14 +3487,14 @@ class FrameController {
     }
     navigateFrame(element, url, submitter) {
         const frame = this.findFrameElement(element, submitter);
-        this.proposeVisitIfNavigatedWithAction(frame, element, submitter);
+        this.pageSnapshot = PageSnapshot.fromElement(frame).clone();
+        frame.delegate.proposeVisitIfNavigatedWithAction(frame, element, submitter);
         this.withCurrentNavigationElement(element, () => {
             frame.src = url;
         });
     }
     proposeVisitIfNavigatedWithAction(frame, element, submitter) {
         this.action = getVisitAction(submitter, element, frame);
-        this.frame = frame;
         if (isAction(this.action)) {
             const { visitCachedSnapshot } = frame.delegate;
             frame.delegate.fetchResponseLoaded = (fetchResponse) => {
@@ -3471,6 +3508,7 @@ class FrameController {
                         willRender: false,
                         updateHistory: false,
                         restorationIdentifier: this.restorationIdentifier,
+                        snapshot: this.pageSnapshot,
                     };
                     if (this.action)
                         options.action = this.action;
@@ -3480,9 +3518,9 @@ class FrameController {
         }
     }
     changeHistory() {
-        if (this.action && this.frame) {
+        if (this.action) {
             const method = getHistoryMethodForAction(this.action);
-            session.history.update(method, expandURL(this.frame.src || ""), this.restorationIdentifier);
+            session.history.update(method, expandURL(this.element.src || ""), this.restorationIdentifier);
         }
     }
     willHandleFrameMissingFromResponse(fetchResponse) {
@@ -3604,14 +3642,6 @@ class FrameController {
         const root = (_a = meta === null || meta === void 0 ? void 0 : meta.content) !== null && _a !== void 0 ? _a : "/";
         return expandURL(root);
     }
-    frameAllowsVisitingLocation(target, { href: url }, originalEvent) {
-        const event = dispatch("turbo:click", {
-            target,
-            detail: { url, originalEvent },
-            cancelable: true,
-        });
-        return !event.defaultPrevented;
-    }
     isIgnoringChangesTo(attributeName) {
         return this.ignoredAttributes.has(attributeName);
     }

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*
-Turbo 7.2.0
+Turbo 7.2.2
 Copyright © 2022 37signals LLC
  */
 (function (global, factory) {
@@ -134,11 +134,7 @@ Copyright © 2022 37signals LLC
             this.delegate.disconnect();
         }
         reload() {
-            const { src } = this;
-            this.removeAttribute("complete");
-            this.src = null;
-            this.src = src;
-            return this.loaded;
+            return this.delegate.sourceURLReloaded();
         }
         attributeChangedCallback(name) {
             if (name == "loading") {
@@ -924,6 +920,7 @@ Copyright © 2022 37signals LLC
                         submissionDoesNotTargetIFrame(form, submitter) &&
                         this.delegate.willSubmitForm(form, submitter)) {
                         event.preventDefault();
+                        event.stopImmediatePropagation();
                         this.delegate.formSubmitted(form, submitter);
                     }
                 }
@@ -1060,6 +1057,48 @@ Copyright © 2022 37signals LLC
         }
     }
 
+    class LinkInterceptor {
+        constructor(delegate, element) {
+            this.clickBubbled = (event) => {
+                if (this.respondsToEventTarget(event.target)) {
+                    this.clickEvent = event;
+                }
+                else {
+                    delete this.clickEvent;
+                }
+            };
+            this.linkClicked = ((event) => {
+                if (this.clickEvent && this.respondsToEventTarget(event.target) && event.target instanceof Element) {
+                    if (this.delegate.shouldInterceptLinkClick(event.target, event.detail.url, event.detail.originalEvent)) {
+                        this.clickEvent.preventDefault();
+                        event.preventDefault();
+                        this.delegate.linkClickIntercepted(event.target, event.detail.url, event.detail.originalEvent);
+                    }
+                }
+                delete this.clickEvent;
+            });
+            this.willVisit = ((_event) => {
+                delete this.clickEvent;
+            });
+            this.delegate = delegate;
+            this.element = element;
+        }
+        start() {
+            this.element.addEventListener("click", this.clickBubbled);
+            document.addEventListener("turbo:click", this.linkClicked);
+            document.addEventListener("turbo:before-visit", this.willVisit);
+        }
+        stop() {
+            this.element.removeEventListener("click", this.clickBubbled);
+            document.removeEventListener("turbo:click", this.linkClicked);
+            document.removeEventListener("turbo:before-visit", this.willVisit);
+        }
+        respondsToEventTarget(target) {
+            const element = target instanceof Element ? target : target instanceof Node ? target.parentElement : null;
+            return element && element.closest("turbo-frame, html") == this.element;
+        }
+    }
+
     class LinkClickObserver {
         constructor(delegate, eventTarget) {
             this.started = false;
@@ -1124,13 +1163,13 @@ Copyright © 2022 37signals LLC
     class FormLinkClickObserver {
         constructor(delegate, element) {
             this.delegate = delegate;
-            this.linkClickObserver = new LinkClickObserver(this, element);
+            this.linkInterceptor = new LinkClickObserver(this, element);
         }
         start() {
-            this.linkClickObserver.start();
+            this.linkInterceptor.start();
         }
         stop() {
-            this.linkClickObserver.stop();
+            this.linkInterceptor.stop();
         }
         willFollowLinkToLocation(link, location, originalEvent) {
             return (this.delegate.willSubmitFormLinkToLocation(link, location, originalEvent) &&
@@ -1652,10 +1691,11 @@ Copyright © 2022 37signals LLC
             this.delegate = delegate;
             this.location = location;
             this.restorationIdentifier = restorationIdentifier || uuid();
-            const { action, historyChanged, referrer, snapshotHTML, response, visitCachedSnapshot, willRender, updateHistory, shouldCacheSnapshot, acceptsStreamResponse, } = Object.assign(Object.assign({}, defaultOptions), options);
+            const { action, historyChanged, referrer, snapshot, snapshotHTML, response, visitCachedSnapshot, willRender, updateHistory, shouldCacheSnapshot, acceptsStreamResponse, } = Object.assign(Object.assign({}, defaultOptions), options);
             this.action = action;
             this.historyChanged = historyChanged;
             this.referrer = referrer;
+            this.snapshot = snapshot;
             this.snapshotHTML = snapshotHTML;
             this.response = response;
             this.isSamePage = this.delegate.locationWithActionIsSamePage(this.location, this.action);
@@ -1943,7 +1983,7 @@ Copyright © 2022 37signals LLC
         }
         cacheSnapshot() {
             if (!this.snapshotCached) {
-                this.view.cacheSnapshot().then((snapshot) => snapshot && this.visitCachedSnapshot(snapshot));
+                this.view.cacheSnapshot(this.snapshot).then((snapshot) => snapshot && this.visitCachedSnapshot(snapshot));
                 this.snapshotCached = true;
             }
         }
@@ -2051,10 +2091,9 @@ Copyright © 2022 37signals LLC
             }
         }
         reload(reason) {
+            var _a;
             dispatch("turbo:reload", { detail: reason });
-            if (!this.location)
-                return;
-            window.location.href = this.location.toString();
+            window.location.href = ((_a = this.location) === null || _a === void 0 ? void 0 : _a.toString()) || window.location.href;
         }
         get navigator() {
             return this.session.navigator;
@@ -2089,24 +2128,24 @@ Copyright © 2022 37signals LLC
         constructor(session, element) {
             this.session = session;
             this.element = element;
-            this.linkClickObserver = new LinkClickObserver(this, element);
+            this.linkInterceptor = new LinkInterceptor(this, element);
             this.formSubmitObserver = new FormSubmitObserver(this, element);
         }
         start() {
-            this.linkClickObserver.start();
+            this.linkInterceptor.start();
             this.formSubmitObserver.start();
         }
         stop() {
-            this.linkClickObserver.stop();
+            this.linkInterceptor.stop();
             this.formSubmitObserver.stop();
         }
-        willFollowLinkToLocation(element, location, event) {
-            return this.shouldRedirect(element) && this.frameAllowsVisitingLocation(element, location, event);
+        shouldInterceptLinkClick(element, _location, _event) {
+            return this.shouldRedirect(element);
         }
-        followedLinkToLocation(element, url) {
+        linkClickIntercepted(element, url, event) {
             const frame = this.findFrameElement(element);
             if (frame) {
-                frame.delegate.followedLinkToLocation(element, url);
+                frame.delegate.linkClickIntercepted(element, url, event);
             }
         }
         willSubmitForm(element, submitter) {
@@ -2120,14 +2159,6 @@ Copyright © 2022 37signals LLC
                 frame.delegate.formSubmitted(element, submitter);
             }
         }
-        frameAllowsVisitingLocation(target, { href: url }, originalEvent) {
-            const event = dispatch("turbo:click", {
-                target,
-                detail: { url, originalEvent },
-                cancelable: true,
-            });
-            return !event.defaultPrevented;
-        }
         shouldSubmit(form, submitter) {
             var _a;
             const action = getAction(form, submitter);
@@ -2754,10 +2785,10 @@ Copyright © 2022 37signals LLC
         clearSnapshotCache() {
             this.snapshotCache.clear();
         }
-        async cacheSnapshot() {
-            if (this.shouldCacheSnapshot) {
+        async cacheSnapshot(snapshot = this.snapshot) {
+            if (snapshot.isCacheable) {
                 this.delegate.viewWillCacheSnapshot();
-                const { snapshot, lastRenderedLocation: location } = this;
+                const { lastRenderedLocation: location } = this;
                 await nextEventLoopTick();
                 const cachedSnapshot = snapshot.clone();
                 this.snapshotCache.put(location, cachedSnapshot);
@@ -2770,9 +2801,6 @@ Copyright © 2022 37signals LLC
         get snapshot() {
             return PageSnapshot.fromElement(this.element);
         }
-        get shouldCacheSnapshot() {
-            return this.snapshot.isCacheable;
-        }
     }
 
     class Preloader {
@@ -3246,7 +3274,7 @@ Copyright © 2022 37signals LLC
             this.view = new FrameView(this, this.element);
             this.appearanceObserver = new AppearanceObserver(this, this.element);
             this.formLinkClickObserver = new FormLinkClickObserver(this, this.element);
-            this.linkClickObserver = new LinkClickObserver(this, this.element);
+            this.linkInterceptor = new LinkInterceptor(this, this.element);
             this.restorationIdentifier = uuid();
             this.formSubmitObserver = new FormSubmitObserver(this, this.element);
         }
@@ -3260,7 +3288,7 @@ Copyright © 2022 37signals LLC
                     this.loadSourceURL();
                 }
                 this.formLinkClickObserver.start();
-                this.linkClickObserver.start();
+                this.linkInterceptor.start();
                 this.formSubmitObserver.start();
             }
         }
@@ -3269,7 +3297,7 @@ Copyright © 2022 37signals LLC
                 this.connected = false;
                 this.appearanceObserver.stop();
                 this.formLinkClickObserver.stop();
-                this.linkClickObserver.stop();
+                this.linkInterceptor.stop();
                 this.formSubmitObserver.stop();
             }
         }
@@ -3288,6 +3316,15 @@ Copyright © 2022 37signals LLC
                 this.loadSourceURL();
             }
         }
+        sourceURLReloaded() {
+            const { src } = this.element;
+            this.ignoringChangesToAttribute("complete", () => {
+                this.element.removeAttribute("complete");
+            });
+            this.element.src = null;
+            this.element.src = src;
+            return this.element.loaded;
+        }
         completeChanged() {
             if (this.isIgnoringChangesTo("complete"))
                 return;
@@ -3349,18 +3386,18 @@ Copyright © 2022 37signals LLC
             this.loadSourceURL();
         }
         willSubmitFormLinkToLocation(link) {
-            return link.closest("turbo-frame") == this.element && this.shouldInterceptNavigation(link);
+            return this.shouldInterceptNavigation(link);
         }
         submittedFormLinkToLocation(link, _location, form) {
             const frame = this.findFrameElement(link);
             if (frame)
                 form.setAttribute("data-turbo-frame", frame.id);
         }
-        willFollowLinkToLocation(element, location, event) {
-            return this.shouldInterceptNavigation(element) && this.frameAllowsVisitingLocation(element, location, event);
+        shouldInterceptLinkClick(element, _location, _event) {
+            return this.shouldInterceptNavigation(element);
         }
-        followedLinkToLocation(element, location) {
-            this.navigateFrame(element, location.href);
+        linkClickIntercepted(element, location) {
+            this.navigateFrame(element, location);
         }
         willSubmitForm(element, submitter) {
             return element.closest("turbo-frame") == this.element && this.shouldInterceptNavigation(element, submitter);
@@ -3408,7 +3445,7 @@ Copyright © 2022 37signals LLC
         }
         formSubmissionSucceededWithResponse(formSubmission, response) {
             const frame = this.findFrameElement(formSubmission.formElement, formSubmission.submitter);
-            this.proposeVisitIfNavigatedWithAction(frame, formSubmission.formElement, formSubmission.submitter);
+            frame.delegate.proposeVisitIfNavigatedWithAction(frame, formSubmission.formElement, formSubmission.submitter);
             frame.delegate.loadResponse(response);
         }
         formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
@@ -3456,14 +3493,14 @@ Copyright © 2022 37signals LLC
         }
         navigateFrame(element, url, submitter) {
             const frame = this.findFrameElement(element, submitter);
-            this.proposeVisitIfNavigatedWithAction(frame, element, submitter);
+            this.pageSnapshot = PageSnapshot.fromElement(frame).clone();
+            frame.delegate.proposeVisitIfNavigatedWithAction(frame, element, submitter);
             this.withCurrentNavigationElement(element, () => {
                 frame.src = url;
             });
         }
         proposeVisitIfNavigatedWithAction(frame, element, submitter) {
             this.action = getVisitAction(submitter, element, frame);
-            this.frame = frame;
             if (isAction(this.action)) {
                 const { visitCachedSnapshot } = frame.delegate;
                 frame.delegate.fetchResponseLoaded = (fetchResponse) => {
@@ -3477,6 +3514,7 @@ Copyright © 2022 37signals LLC
                             willRender: false,
                             updateHistory: false,
                             restorationIdentifier: this.restorationIdentifier,
+                            snapshot: this.pageSnapshot,
                         };
                         if (this.action)
                             options.action = this.action;
@@ -3486,9 +3524,9 @@ Copyright © 2022 37signals LLC
             }
         }
         changeHistory() {
-            if (this.action && this.frame) {
+            if (this.action) {
                 const method = getHistoryMethodForAction(this.action);
-                session.history.update(method, expandURL(this.frame.src || ""), this.restorationIdentifier);
+                session.history.update(method, expandURL(this.element.src || ""), this.restorationIdentifier);
             }
         }
         willHandleFrameMissingFromResponse(fetchResponse) {
@@ -3610,14 +3648,6 @@ Copyright © 2022 37signals LLC
             const root = (_a = meta === null || meta === void 0 ? void 0 : meta.content) !== null && _a !== void 0 ? _a : "/";
             return expandURL(root);
         }
-        frameAllowsVisitingLocation(target, { href: url }, originalEvent) {
-            const event = dispatch("turbo:click", {
-                target,
-                detail: { url, originalEvent },
-                cancelable: true,
-            });
-            return !event.defaultPrevented;
-        }
         isIgnoringChangesTo(attributeName) {
             return this.ignoredAttributes.has(attributeName);
         }

package/dist/types/core/drive/page_view.d.ts

@@ -16,9 +16,8 @@ export declare class PageView extends View<HTMLBodyElement, PageSnapshot, PageVi
     renderPage(snapshot: PageSnapshot, isPreview?: boolean, willRender?: boolean, visit?: Visit): Promise<void>;
     renderError(snapshot: PageSnapshot, visit?: Visit): Promise<void>;
     clearSnapshotCache(): void;
-    cacheSnapshot(): Promise<PageSnapshot | undefined>;
+    cacheSnapshot(snapshot?: PageSnapshot): Promise<PageSnapshot | undefined>;
     getCachedSnapshotForLocation(location: URL): PageSnapshot | undefined;
     get snapshot(): PageSnapshot;
-    get shouldCacheSnapshot(): boolean;
 }
 export {};

package/dist/types/core/drive/visit.d.ts

@@ -35,6 +35,7 @@ export declare type VisitOptions = {
     action: Action;
     historyChanged: boolean;
     referrer?: URL;
+    snapshot?: PageSnapshot;
     snapshotHTML?: string;
     response?: VisitResponse;
     visitCachedSnapshot(snapshot: Snapshot): void;
@@ -79,6 +80,7 @@ export declare class Visit implements FetchRequestDelegate {
     snapshotHTML?: string;
     snapshotCached: boolean;
     state: VisitState;
+    snapshot?: PageSnapshot;
     constructor(delegate: VisitDelegate, location: URL, restorationIdentifier: string | undefined, options?: Partial<VisitOptions>);
     get adapter(): Adapter;
     get view(): PageView;

package/dist/types/core/frames/frame_controller.d.ts

@@ -8,20 +8,21 @@ import { ViewDelegate, ViewRenderOptions } from "../view";
 import { Locatable } from "../url";
 import { FormSubmitObserver, FormSubmitObserverDelegate } from "../../observers/form_submit_observer";
 import { FrameView } from "./frame_view";
-import { LinkClickObserver, LinkClickObserverDelegate } from "../../observers/link_click_observer";
+import { LinkInterceptor, LinkInterceptorDelegate } from "./link_interceptor";
 import { FormLinkClickObserver, FormLinkClickObserverDelegate } from "../../observers/form_link_click_observer";
 import { VisitOptions } from "../drive/visit";
+import { PageSnapshot } from "../drive/page_snapshot";
 declare type VisitFallback = (location: Response | Locatable, options: Partial<VisitOptions>) => Promise<void>;
 export declare type TurboFrameMissingEvent = CustomEvent<{
     response: Response;
     visit: VisitFallback;
 }>;
-export declare class FrameController implements AppearanceObserverDelegate, FetchRequestDelegate, FormSubmitObserverDelegate, FormSubmissionDelegate, FrameElementDelegate, FormLinkClickObserverDelegate, LinkClickObserverDelegate, ViewDelegate<FrameElement, Snapshot<FrameElement>> {
+export declare class FrameController implements AppearanceObserverDelegate, FetchRequestDelegate, FormSubmitObserverDelegate, FormSubmissionDelegate, FrameElementDelegate, FormLinkClickObserverDelegate, LinkInterceptorDelegate, ViewDelegate<FrameElement, Snapshot<FrameElement>> {
     readonly element: FrameElement;
     readonly view: FrameView;
     readonly appearanceObserver: AppearanceObserver;
     readonly formLinkClickObserver: FormLinkClickObserver;
-    readonly linkClickObserver: LinkClickObserver;
+    readonly linkInterceptor: LinkInterceptor;
     readonly formSubmitObserver: FormSubmitObserver;
     formSubmission?: FormSubmission;
     fetchResponseLoaded: (_fetchResponse: FetchResponse) => void;
@@ -31,15 +32,16 @@ export declare class FrameController implements AppearanceObserverDelegate, Fetc
     private hasBeenLoaded;
     private ignoredAttributes;
     private action;
-    private frame?;
     readonly restorationIdentifier: string;
     private previousFrameElement?;
     private currentNavigationElement?;
+    pageSnapshot?: PageSnapshot;
     constructor(element: FrameElement);
     connect(): void;
     disconnect(): void;
     disabledChanged(): void;
     sourceURLChanged(): void;
+    sourceURLReloaded(): Promise<void>;
     completeChanged(): void;
     loadingStyleChanged(): void;
     private loadSourceURL;
@@ -47,8 +49,8 @@ export declare class FrameController implements AppearanceObserverDelegate, Fetc
     elementAppearedInViewport(_element: Element): void;
     willSubmitFormLinkToLocation(link: Element): boolean;
     submittedFormLinkToLocation(link: Element, _location: URL, form: HTMLFormElement): void;
-    willFollowLinkToLocation(element: Element, location: URL, event: MouseEvent): boolean;
-    followedLinkToLocation(element: Element, location: URL): void;
+    shouldInterceptLinkClick(element: Element, _location: string, _event: MouseEvent): boolean;
+    linkClickIntercepted(element: Element, location: string): void;
     willSubmitForm(element: HTMLFormElement, submitter?: HTMLElement): boolean;
     formSubmitted(element: HTMLFormElement, submitter?: HTMLElement): void;
     prepareHeadersForRequest(headers: FetchRequestHeaders, request: FetchRequest): void;
@@ -71,7 +73,7 @@ export declare class FrameController implements AppearanceObserverDelegate, Fetc
     visitCachedSnapshot: ({ element }: Snapshot) => void;
     private visit;
     private navigateFrame;
-    private proposeVisitIfNavigatedWithAction;
+    proposeVisitIfNavigatedWithAction(frame: FrameElement, element: Element, submitter?: HTMLElement): void;
     changeHistory(): void;
     private willHandleFrameMissingFromResponse;
     private visitResponse;
@@ -89,7 +91,6 @@ export declare class FrameController implements AppearanceObserverDelegate, Fetc
     set complete(value: boolean);
     get isActive(): boolean;
     get rootLocation(): URL;
-    private frameAllowsVisitingLocation;
     private isIgnoringChangesTo;
     private ignoringChangesToAttribute;
     private withCurrentNavigationElement;

package/dist/types/core/frames/frame_redirector.d.ts

@@ -1,19 +1,18 @@
 import { FormSubmitObserver, FormSubmitObserverDelegate } from "../../observers/form_submit_observer";
-import { LinkClickObserver, LinkClickObserverDelegate } from "../../observers/link_click_observer";
+import { LinkInterceptor, LinkInterceptorDelegate } from "./link_interceptor";
 import { Session } from "../session";
-export declare class FrameRedirector implements LinkClickObserverDelegate, FormSubmitObserverDelegate {
+export declare class FrameRedirector implements LinkInterceptorDelegate, FormSubmitObserverDelegate {
     readonly session: Session;
     readonly element: Element;
-    readonly linkClickObserver: LinkClickObserver;
+    readonly linkInterceptor: LinkInterceptor;
     readonly formSubmitObserver: FormSubmitObserver;
     constructor(session: Session, element: Element);
     start(): void;
     stop(): void;
-    willFollowLinkToLocation(element: Element, location: URL, event: MouseEvent): boolean;
-    followedLinkToLocation(element: Element, url: URL): void;
+    shouldInterceptLinkClick(element: Element, _location: string, _event: MouseEvent): boolean;
+    linkClickIntercepted(element: Element, url: string, event: MouseEvent): void;
     willSubmitForm(element: HTMLFormElement, submitter?: HTMLElement): boolean;
     formSubmitted(element: HTMLFormElement, submitter?: HTMLElement): void;
-    private frameAllowsVisitingLocation;
     private shouldSubmit;
     private shouldRedirect;
     private findFrameElement;

package/dist/types/core/frames/link_interceptor.d.ts

@@ -0,0 +1,16 @@
+export interface LinkInterceptorDelegate {
+    shouldInterceptLinkClick(element: Element, url: string, originalEvent: MouseEvent): boolean;
+    linkClickIntercepted(element: Element, url: string, originalEvent: MouseEvent): void;
+}
+export declare class LinkInterceptor {
+    readonly delegate: LinkInterceptorDelegate;
+    readonly element: Element;
+    private clickEvent?;
+    constructor(delegate: LinkInterceptorDelegate, element: Element);
+    start(): void;
+    stop(): void;
+    clickBubbled: (event: Event) => void;
+    linkClicked: EventListener;
+    willVisit: EventListener;
+    respondsToEventTarget(target: EventTarget | null): boolean | null;
+}

package/dist/types/elements/frame_element.d.ts

@@ -1,20 +1,22 @@
 import { FetchResponse } from "../http/fetch_response";
 import { Snapshot } from "../core/snapshot";
-import { LinkClickObserverDelegate } from "../observers/link_click_observer";
+import { LinkInterceptorDelegate } from "../core/frames/link_interceptor";
 import { FormSubmitObserverDelegate } from "../observers/form_submit_observer";
 export declare enum FrameLoadingStyle {
     eager = "eager",
     lazy = "lazy"
 }
 export declare type FrameElementObservedAttribute = keyof FrameElement & ("disabled" | "complete" | "loading" | "src");
-export interface FrameElementDelegate extends LinkClickObserverDelegate, FormSubmitObserverDelegate {
+export interface FrameElementDelegate extends LinkInterceptorDelegate, FormSubmitObserverDelegate {
     connect(): void;
     disconnect(): void;
     completeChanged(): void;
     loadingStyleChanged(): void;
     sourceURLChanged(): void;
+    sourceURLReloaded(): Promise<void>;
     disabledChanged(): void;
     loadResponse(response: FetchResponse): void;
+    proposeVisitIfNavigatedWithAction(frame: FrameElement, element: Element, submitter?: HTMLElement): void;
     fetchResponseLoaded: (fetchResponse: FetchResponse) => void;
     visitCachedSnapshot: (snapshot: Snapshot) => void;
     isLoading: boolean;

package/dist/types/observers/form_link_click_observer.d.ts

@@ -4,7 +4,7 @@ export declare type FormLinkClickObserverDelegate = {
     submittedFormLinkToLocation(link: Element, location: URL, form: HTMLFormElement): void;
 };
 export declare class FormLinkClickObserver implements LinkClickObserverDelegate {
-    readonly linkClickObserver: LinkClickObserver;
+    readonly linkInterceptor: LinkClickObserver;
     readonly delegate: FormLinkClickObserverDelegate;
     constructor(delegate: FormLinkClickObserverDelegate, element: HTMLElement);
     start(): void;

package/dist/types/tests/helpers/page.d.ts

@@ -22,6 +22,7 @@ export declare function nextBeat(): Promise<void>;
 export declare function nextBody(_page: Page, timeout?: number): Promise<void>;
 export declare function nextEventNamed(page: Page, eventName: string): Promise<any>;
 export declare function nextEventOnTarget(page: Page, elementId: string, eventName: string): Promise<any>;
+export declare function listenForEventOnTarget(page: Page, elementId: string, eventName: string): Promise<void>;
 export declare function nextAttributeMutationNamed(page: Page, elementId: string, attributeName: string): Promise<string | null>;
 export declare function noNextAttributeMutationNamed(page: Page, elementId: string, attributeName: string): Promise<boolean>;
 export declare function noNextEventNamed(page: Page, eventName: string): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotwired/turbo",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "The speed of a single-page web application without having to write any JavaScript",
   "module": "dist/turbo.es2017-esm.js",
   "main": "dist/turbo.es2017-umd.js",