@hotwired/turbo 7.0.0-rc.1 → 7.0.0-rc.3

package/dist/turbo.es2017-umd.js

@@ -1,5 +1,5 @@
 /*
-Turbo 7.0.0-rc.1
+Turbo 7.0.0-rc.2
 Copyright © 2021 Basecamp, LLC
  */
 (function (global, factory) {
@@ -344,8 +344,10 @@ Copyright © 2021 Basecamp, LLC
                 return await this.receive(response);
             }
             catch (error) {
-                this.delegate.requestErrored(this, error);
-                throw error;
+                if (error.name !== 'AbortError') {
+                    this.delegate.requestErrored(this, error);
+                    throw error;
+                }
             }
             finally {
                 this.delegate.requestFinished(this);
@@ -366,13 +368,15 @@ Copyright © 2021 Basecamp, LLC
             return fetchResponse;
         }
         get fetchOptions() {
+            var _a;
             return {
                 method: FetchMethod[this.method].toUpperCase(),
                 credentials: "same-origin",
                 headers: this.headers,
                 redirect: "follow",
                 body: this.body,
-                signal: this.abortSignal
+                signal: this.abortSignal,
+                referrer: (_a = this.delegate.referrer) === null || _a === void 0 ? void 0 : _a.href
             };
         }
         get defaultHeaders() {
@@ -511,7 +515,8 @@ Copyright © 2021 Basecamp, LLC
         }
         get action() {
             var _a;
-            return ((_a = this.submitter) === null || _a === void 0 ? void 0 : _a.getAttribute("formaction")) || this.formElement.action;
+            const formElementAction = typeof this.formElement.action === 'string' ? this.formElement.action : null;
+            return ((_a = this.submitter) === null || _a === void 0 ? void 0 : _a.getAttribute("formaction")) || this.formElement.getAttribute("action") || formElementAction || "";
         }
         get location() {
             return expandURL(this.action);
@@ -637,12 +642,7 @@ Copyright © 2021 Basecamp, LLC
             return this.getElementForAnchor(anchor) != null;
         }
         getElementForAnchor(anchor) {
-            try {
-                return this.element.querySelector(`[id='${anchor}'], a[name='${anchor}']`);
-            }
-            catch (_a) {
-                return null;
-            }
+            return anchor ? this.element.querySelector(`[id='${anchor}'], a[name='${anchor}']`) : null;
         }
         get isConnected() {
             return this.element.isConnected;
@@ -731,6 +731,9 @@ Copyright © 2021 Basecamp, LLC
         scrollToPosition({ x, y }) {
             this.scrollRoot.scrollTo(x, y);
         }
+        scrollToTop() {
+            this.scrollToPosition({ x: 0, y: 0 });
+        }
         get scrollRoot() {
             return window;
         }
@@ -1299,6 +1302,9 @@ Copyright © 2021 Basecamp, LLC
         get restorationData() {
             return this.history.getRestorationDataForIdentifier(this.restorationIdentifier);
         }
+        get silent() {
+            return this.isSamePage;
+        }
         start() {
             if (this.state == VisitState.initialized) {
                 this.recordTimingMetric(TimingMetric.visitStart);
@@ -1322,6 +1328,7 @@ Copyright © 2021 Basecamp, LLC
                 this.state = VisitState.completed;
                 this.adapter.visitCompleted(this);
                 this.delegate.visitCompleted(this);
+                this.followRedirect();
             }
         }
         fail() {
@@ -1434,8 +1441,10 @@ Copyright © 2021 Basecamp, LLC
         }
         followRedirect() {
             if (this.redirectedToLocation && !this.followedRedirect) {
-                this.location = this.redirectedToLocation;
-                this.history.replace(this.redirectedToLocation, this.restorationIdentifier);
+                this.adapter.visitProposedToLocation(this.redirectedToLocation, {
+                    action: 'replace',
+                    response: this.response
+                });
                 this.followedRedirect = true;
             }
         }
@@ -1480,10 +1489,10 @@ Copyright © 2021 Basecamp, LLC
         performScroll() {
             if (!this.scrolled) {
                 if (this.action == "restore") {
-                    this.scrollToRestoredPosition() || this.scrollToAnchor() || this.scrollToTop();
+                    this.scrollToRestoredPosition() || this.scrollToAnchor() || this.view.scrollToTop();
                 }
                 else {
-                    this.scrollToAnchor() || this.scrollToTop();
+                    this.scrollToAnchor() || this.view.scrollToTop();
                 }
                 if (this.isSamePage) {
                     this.delegate.visitScrolledToSamePageLocation(this.view.lastRenderedLocation, this.location);
@@ -1505,9 +1514,6 @@ Copyright © 2021 Basecamp, LLC
                 return true;
             }
         }
-        scrollToTop() {
-            this.view.scrollToPosition({ x: 0, y: 0 });
-        }
         recordTimingMetric(metric) {
             this.timingMetrics[metric] = new Date().getTime();
         }
@@ -1581,7 +1587,7 @@ Copyright © 2021 Basecamp, LLC
         visitRequestStarted(visit) {
             this.progressBar.setValue(0);
             if (visit.hasCachedSnapshot() || visit.action != "restore") {
-                this.showProgressBarAfterDelay();
+                this.showVisitProgressBarAfterDelay();
             }
             else {
                 this.showProgressBar();
@@ -1602,10 +1608,9 @@ Copyright © 2021 Basecamp, LLC
         }
         visitRequestFinished(visit) {
             this.progressBar.setValue(1);
-            this.hideProgressBar();
+            this.hideVisitProgressBar();
         }
         visitCompleted(visit) {
-            visit.followRedirect();
         }
         pageInvalidated() {
             this.reload();
@@ -1614,14 +1619,34 @@ Copyright © 2021 Basecamp, LLC
         }
         visitRendered(visit) {
         }
-        showProgressBarAfterDelay() {
-            this.progressBarTimeout = window.setTimeout(this.showProgressBar, this.session.progressBarDelay);
+        formSubmissionStarted(formSubmission) {
+            this.progressBar.setValue(0);
+            this.showFormProgressBarAfterDelay();
+        }
+        formSubmissionFinished(formSubmission) {
+            this.progressBar.setValue(1);
+            this.hideFormProgressBar();
+        }
+        showVisitProgressBarAfterDelay() {
+            this.visitProgressBarTimeout = window.setTimeout(this.showProgressBar, this.session.progressBarDelay);
+        }
+        hideVisitProgressBar() {
+            this.progressBar.hide();
+            if (this.visitProgressBarTimeout != null) {
+                window.clearTimeout(this.visitProgressBarTimeout);
+                delete this.visitProgressBarTimeout;
+            }
         }
-        hideProgressBar() {
+        showFormProgressBarAfterDelay() {
+            if (this.formProgressBarTimeout == null) {
+                this.formProgressBarTimeout = window.setTimeout(this.showProgressBar, this.session.progressBarDelay);
+            }
+        }
+        hideFormProgressBar() {
             this.progressBar.hide();
-            if (this.progressBarTimeout != null) {
-                window.clearTimeout(this.progressBarTimeout);
-                delete this.progressBarTimeout;
+            if (this.formProgressBarTimeout != null) {
+                window.clearTimeout(this.formProgressBarTimeout);
+                delete this.formProgressBarTimeout;
             }
         }
         reload() {
@@ -1712,6 +1737,7 @@ Copyright © 2021 Basecamp, LLC
         linkClickIntercepted(element, url) {
             const frame = this.findFrameElement(element);
             if (frame) {
+                frame.setAttribute("reloadable", "");
                 frame.src = url;
             }
         }
@@ -1721,6 +1747,7 @@ Copyright © 2021 Basecamp, LLC
         formSubmissionIntercepted(element, submitter) {
             const frame = this.findFrameElement(element);
             if (frame) {
+                frame.removeAttribute("reloadable");
                 frame.delegate.formSubmissionIntercepted(element, submitter);
             }
         }
@@ -1827,7 +1854,8 @@ Copyright © 2021 Basecamp, LLC
             };
             this.clickBubbled = (event) => {
                 if (this.clickEventIsSignificant(event)) {
-                    const link = this.findLinkFromClickTarget(event.target);
+                    const target = (event.composedPath && event.composedPath()[0]) || event.target;
+                    const link = this.findLinkFromClickTarget(target);
                     if (link) {
                         const location = this.getLocationForLink(link);
                         if (this.delegate.willFollowLinkToLocation(link, location)) {
@@ -1879,7 +1907,7 @@ Copyright © 2021 Basecamp, LLC
             this.delegate = delegate;
         }
         proposeVisit(location, options = {}) {
-            if (this.delegate.allowsVisitingLocation(location)) {
+            if (this.delegate.allowsVisitingLocationWithAction(location, options.action)) {
                 this.delegate.visitProposedToLocation(location, options);
             }
         }
@@ -1918,6 +1946,9 @@ Copyright © 2021 Basecamp, LLC
             return this.delegate.history;
         }
         formSubmissionStarted(formSubmission) {
+            if (typeof this.adapter.formSubmissionStarted === 'function') {
+                this.adapter.formSubmissionStarted(formSubmission);
+            }
         }
         async formSubmissionSucceededWithResponse(formSubmission, fetchResponse) {
             if (formSubmission == this.formSubmission) {
@@ -1936,7 +1967,13 @@ Copyright © 2021 Basecamp, LLC
             const responseHTML = await fetchResponse.responseHTML;
             if (responseHTML) {
                 const snapshot = PageSnapshot.fromHTMLString(responseHTML);
-                await this.view.renderPage(snapshot);
+                if (fetchResponse.serverError) {
+                    await this.view.renderError(snapshot);
+                }
+                else {
+                    await this.view.renderPage(snapshot);
+                }
+                this.view.scrollToTop();
                 this.view.clearSnapshotCache();
             }
         }
@@ -1944,6 +1981,9 @@ Copyright © 2021 Basecamp, LLC
             console.error(error);
         }
         formSubmissionFinished(formSubmission) {
+            if (typeof this.adapter.formSubmissionFinished === 'function') {
+                this.adapter.formSubmissionFinished(formSubmission);
+            }
         }
         visitStarted(visit) {
             this.delegate.visitStarted(visit);
@@ -1952,8 +1992,12 @@ Copyright © 2021 Basecamp, LLC
             this.delegate.visitCompleted(visit);
         }
         locationWithActionIsSamePage(location, action) {
-            return getRequestURL(location) === getRequestURL(this.view.lastRenderedLocation) &&
-                (getAnchor(location) != null || action == "restore");
+            const anchor = getAnchor(location);
+            const currentAnchor = getAnchor(this.view.lastRenderedLocation);
+            const isRestorationToTop = action === 'restore' && typeof anchor === 'undefined';
+            return action !== "replace" &&
+                getRequestURL(location) === getRequestURL(this.view.lastRenderedLocation) &&
+                (isRestorationToTop || (anchor != null && anchor !== currentAnchor));
         }
         visitScrolledToSamePageLocation(oldURL, newURL) {
             this.delegate.visitScrolledToSamePageLocation(oldURL, newURL);
@@ -2341,6 +2385,7 @@ Copyright © 2021 Basecamp, LLC
             this.scrollObserver = new ScrollObserver(this);
             this.streamObserver = new StreamObserver(this);
             this.frameRedirector = new FrameRedirector(document.documentElement);
+            this.drive = true;
             this.enabled = true;
             this.progressBarDelay = 500;
             this.started = false;
@@ -2414,7 +2459,7 @@ Copyright © 2021 Basecamp, LLC
             this.history.updateRestorationData({ scrollPosition: position });
         }
         willFollowLinkToLocation(link, location) {
-            return elementIsNavigable(link)
+            return this.elementDriveEnabled(link)
                 && this.locationIsVisitable(location)
                 && this.applicationAllowsFollowingLinkToLocation(link, location);
         }
@@ -2423,21 +2468,20 @@ Copyright © 2021 Basecamp, LLC
             this.convertLinkWithMethodClickToFormSubmission(link) || this.visit(location.href, { action });
         }
         convertLinkWithMethodClickToFormSubmission(link) {
-            var _a;
             const linkMethod = link.getAttribute("data-turbo-method");
             if (linkMethod) {
                 const form = document.createElement("form");
                 form.method = linkMethod;
                 form.action = link.getAttribute("href") || "undefined";
-                (_a = link.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(form, link);
+                document.body.appendChild(form);
                 return dispatch("submit", { cancelable: true, target: form });
             }
             else {
                 return false;
             }
         }
-        allowsVisitingLocation(location) {
-            return this.applicationAllowsVisitingLocation(location);
+        allowsVisitingLocationWithAction(location, action) {
+            return this.locationWithActionIsSamePage(location, action) || this.applicationAllowsVisitingLocation(location);
         }
         visitProposedToLocation(location, options) {
             extendURLWithDeprecatedProperties(location);
@@ -2445,7 +2489,9 @@ Copyright © 2021 Basecamp, LLC
         }
         visitStarted(visit) {
             extendURLWithDeprecatedProperties(visit.location);
-            this.notifyApplicationAfterVisitingLocation(visit.location, visit.action);
+            if (!visit.silent) {
+                this.notifyApplicationAfterVisitingLocation(visit.location, visit.action);
+            }
         }
         visitCompleted(visit) {
             this.notifyApplicationAfterPageLoad(visit.getTimingMetrics());
@@ -2457,7 +2503,7 @@ Copyright © 2021 Basecamp, LLC
             this.notifyApplicationAfterVisitingSamePageLocation(oldURL, newURL);
         }
         willSubmitForm(form, submitter) {
-            return elementIsNavigable(form) && elementIsNavigable(submitter);
+            return this.elementDriveEnabled(form) && this.elementDriveEnabled(submitter);
         }
         formSubmitted(form, submitter) {
             this.navigator.submitForm(form, submitter);
@@ -2476,7 +2522,10 @@ Copyright © 2021 Basecamp, LLC
             this.renderStreamMessage(message);
         }
         viewWillCacheSnapshot() {
-            this.notifyApplicationBeforeCachingSnapshot();
+            var _a;
+            if (!((_a = this.navigator.currentVisit) === null || _a === void 0 ? void 0 : _a.silent)) {
+                this.notifyApplicationBeforeCachingSnapshot();
+            }
         }
         allowsImmediateRender({ element }, resume) {
             const event = this.notifyApplicationBeforeRender(element, resume);
@@ -2489,6 +2538,12 @@ Copyright © 2021 Basecamp, LLC
         viewInvalidated() {
             this.adapter.pageInvalidated();
         }
+        frameLoaded(frame) {
+            this.notifyApplicationAfterFrameLoad(frame);
+        }
+        frameRendered(fetchResponse, frame) {
+            this.notifyApplicationAfterFrameRender(fetchResponse, frame);
+        }
         applicationAllowsFollowingLinkToLocation(link, location) {
             const event = this.notifyApplicationAfterClickingLinkToLocation(link, location);
             return !event.defaultPrevented;
@@ -2521,6 +2576,31 @@ Copyright © 2021 Basecamp, LLC
         notifyApplicationAfterVisitingSamePageLocation(oldURL, newURL) {
             dispatchEvent(new HashChangeEvent("hashchange", { oldURL: oldURL.toString(), newURL: newURL.toString() }));
         }
+        notifyApplicationAfterFrameLoad(frame) {
+            return dispatch("turbo:frame-load", { target: frame });
+        }
+        notifyApplicationAfterFrameRender(fetchResponse, frame) {
+            return dispatch("turbo:frame-render", { detail: { fetchResponse }, target: frame, cancelable: true });
+        }
+        elementDriveEnabled(element) {
+            const container = element === null || element === void 0 ? void 0 : element.closest("[data-turbo]");
+            if (this.drive) {
+                if (container) {
+                    return container.getAttribute("data-turbo") != "false";
+                }
+                else {
+                    return true;
+                }
+            }
+            else {
+                if (container) {
+                    return container.getAttribute("data-turbo") == "true";
+                }
+                else {
+                    return false;
+                }
+            }
+        }
         getActionForLink(link) {
             const action = link.getAttribute("data-turbo-action");
             return isAction(action) ? action : "advance";
@@ -2532,15 +2612,6 @@ Copyright © 2021 Basecamp, LLC
             return this.view.snapshot;
         }
     }
-    function elementIsNavigable(element) {
-        const container = element === null || element === void 0 ? void 0 : element.closest("[data-turbo]");
-        if (container) {
-            return container.getAttribute("data-turbo") != "false";
-        }
-        else {
-            return true;
-        }
-    }
     function extendURLWithDeprecatedProperties(url) {
         Object.defineProperties(url, deprecatedLocationPropertyDescriptors);
     }
@@ -2552,6 +2623,49 @@ Copyright © 2021 Basecamp, LLC
         }
     };
 
+    const session = new Session;
+    const { navigator } = session;
+    function start() {
+        session.start();
+    }
+    function registerAdapter(adapter) {
+        session.registerAdapter(adapter);
+    }
+    function visit(location, options) {
+        session.visit(location, options);
+    }
+    function connectStreamSource(source) {
+        session.connectStreamSource(source);
+    }
+    function disconnectStreamSource(source) {
+        session.disconnectStreamSource(source);
+    }
+    function renderStreamMessage(message) {
+        session.renderStreamMessage(message);
+    }
+    function clearCache() {
+        session.clearCache();
+    }
+    function setProgressBarDelay(delay) {
+        session.setProgressBarDelay(delay);
+    }
+
+    var Turbo = /*#__PURE__*/Object.freeze({
+        __proto__: null,
+        navigator: navigator,
+        session: session,
+        PageRenderer: PageRenderer,
+        PageSnapshot: PageSnapshot,
+        start: start,
+        registerAdapter: registerAdapter,
+        visit: visit,
+        connectStreamSource: connectStreamSource,
+        disconnectStreamSource: disconnectStreamSource,
+        renderStreamMessage: renderStreamMessage,
+        clearCache: clearCache,
+        setProgressBarDelay: setProgressBarDelay
+    });
+
     class FrameController {
         constructor(element) {
             this.resolveVisitPromise = () => { };
@@ -2567,6 +2681,7 @@ Copyright © 2021 Basecamp, LLC
         connect() {
             if (!this.connected) {
                 this.connected = true;
+                this.reloadable = false;
                 if (this.loadingStyle == FrameLoadingStyle.lazy) {
                     this.appearanceObserver.start();
                 }
@@ -2603,7 +2718,7 @@ Copyright © 2021 Basecamp, LLC
             }
         }
         async loadSourceURL() {
-            if (!this.settingSourceURL && this.enabled && this.isActive && this.sourceURL != this.currentURL) {
+            if (!this.settingSourceURL && this.enabled && this.isActive && (this.reloadable || this.sourceURL != this.currentURL)) {
                 const previousURL = this.currentURL;
                 this.currentURL = this.sourceURL;
                 if (this.sourceURL) {
@@ -2612,6 +2727,7 @@ Copyright © 2021 Basecamp, LLC
                         this.appearanceObserver.stop();
                         await this.element.loaded;
                         this.hasBeenLoaded = true;
+                        session.frameLoaded(this.element);
                     }
                     catch (error) {
                         this.currentURL = previousURL;
@@ -2633,6 +2749,7 @@ Copyright © 2021 Basecamp, LLC
                     if (this.view.renderPromise)
                         await this.view.renderPromise;
                     await this.view.render(renderer);
+                    session.frameRendered(fetchResponse, this.element);
                 }
             }
             catch (error) {
@@ -2652,6 +2769,7 @@ Copyright © 2021 Basecamp, LLC
             }
         }
         linkClickIntercepted(element, url) {
+            this.reloadable = true;
             this.navigateFrame(element, url);
         }
         shouldInterceptFormSubmission(element, submitter) {
@@ -2661,6 +2779,7 @@ Copyright © 2021 Basecamp, LLC
             if (this.formSubmission) {
                 this.formSubmission.stop();
             }
+            this.reloadable = false;
             this.formSubmission = new FormSubmission(this, element, submitter);
             if (this.formSubmission.fetchRequest.isIdempotent) {
                 this.navigateFrame(element, this.formSubmission.fetchRequest.url.href);
@@ -2768,10 +2887,10 @@ Copyright © 2021 Basecamp, LLC
                     return !frameElement.disabled;
                 }
             }
-            if (!elementIsNavigable(element)) {
+            if (!session.elementDriveEnabled(element)) {
                 return false;
             }
-            if (submitter && !elementIsNavigable(submitter)) {
+            if (submitter && !session.elementDriveEnabled(submitter)) {
                 return false;
             }
             return true;
@@ -2787,6 +2906,19 @@ Copyright © 2021 Basecamp, LLC
                 return this.element.src;
             }
         }
+        get reloadable() {
+            const frame = this.findFrameElement(this.element);
+            return frame.hasAttribute("reloadable");
+        }
+        set reloadable(value) {
+            const frame = this.findFrameElement(this.element);
+            if (value) {
+                frame.setAttribute("reloadable", "");
+            }
+            else {
+                frame.removeAttribute("reloadable");
+            }
+        }
         set sourceURL(sourceURL) {
             this.settingSourceURL = true;
             this.element.src = sourceURL !== null && sourceURL !== void 0 ? sourceURL : null;
@@ -2989,48 +3121,6 @@ Copyright © 2021 Basecamp, LLC
         }
     })();
 
-    const session = new Session;
-    const { navigator } = session;
-    function start() {
-        session.start();
-    }
-    function registerAdapter(adapter) {
-        session.registerAdapter(adapter);
-    }
-    function visit(location, options) {
-        session.visit(location, options);
-    }
-    function connectStreamSource(source) {
-        session.connectStreamSource(source);
-    }
-    function disconnectStreamSource(source) {
-        session.disconnectStreamSource(source);
-    }
-    function renderStreamMessage(message) {
-        session.renderStreamMessage(message);
-    }
-    function clearCache() {
-        session.clearCache();
-    }
-    function setProgressBarDelay(delay) {
-        session.setProgressBarDelay(delay);
-    }
-
-    var Turbo = /*#__PURE__*/Object.freeze({
-        __proto__: null,
-        navigator: navigator,
-        PageRenderer: PageRenderer,
-        PageSnapshot: PageSnapshot,
-        start: start,
-        registerAdapter: registerAdapter,
-        visit: visit,
-        connectStreamSource: connectStreamSource,
-        disconnectStreamSource: disconnectStreamSource,
-        renderStreamMessage: renderStreamMessage,
-        clearCache: clearCache,
-        setProgressBarDelay: setProgressBarDelay
-    });
-
     window.Turbo = Turbo;
     start();
 
@@ -3042,6 +3132,7 @@ Copyright © 2021 Basecamp, LLC
     exports.navigator = navigator;
     exports.registerAdapter = registerAdapter;
     exports.renderStreamMessage = renderStreamMessage;
+    exports.session = session;
     exports.setProgressBarDelay = setProgressBarDelay;
     exports.start = start;
     exports.visit = visit;
@@ -3049,4 +3140,3 @@ Copyright © 2021 Basecamp, LLC
     Object.defineProperty(exports, '__esModule', { value: true });
 
 })));
-//# sourceMappingURL=turbo.es2017-umd.js.map