@hotwired/turbo 7.2.0-rc.3 → 7.2.1

package/README.md

@@ -15,4 +15,4 @@ Read more on [turbo.hotwired.dev](https://turbo.hotwired.dev).
 
 Please read [CONTRIBUTING.md](./CONTRIBUTING.md).
 
-© 2021 Basecamp, LLC.
+© 2021 37signals LLC.

package/dist/turbo.es2017-esm.js

@@ -1,6 +1,6 @@
 /*
-Turbo 7.2.0-rc.3
-Copyright © 2022 Basecamp, LLC
+Turbo 7.2.0
+Copyright © 2022 37signals LLC
  */
 (function () {
     if (window.Reflect === undefined ||
@@ -2094,8 +2094,8 @@ class FrameRedirector {
         this.linkClickObserver.stop();
         this.formSubmitObserver.stop();
     }
-    willFollowLinkToLocation(element) {
-        return this.shouldRedirect(element);
+    willFollowLinkToLocation(element, location, event) {
+        return this.shouldRedirect(element) && this.frameAllowsVisitingLocation(element, location, event);
     }
     followedLinkToLocation(element, url) {
         const frame = this.findFrameElement(element);
@@ -2114,6 +2114,14 @@ 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);
@@ -3342,8 +3350,8 @@ class FrameController {
         if (frame)
             form.setAttribute("data-turbo-frame", frame.id);
     }
-    willFollowLinkToLocation(element) {
-        return this.shouldInterceptNavigation(element);
+    willFollowLinkToLocation(element, location, event) {
+        return this.shouldInterceptNavigation(element) && this.frameAllowsVisitingLocation(element, location, event);
     }
     followedLinkToLocation(element, location) {
         this.navigateFrame(element, location.href);
@@ -3596,6 +3604,14 @@ 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,6 +1,6 @@
 /*
-Turbo 7.2.0-rc.3
-Copyright © 2022 Basecamp, LLC
+Turbo 7.2.0
+Copyright © 2022 37signals LLC
  */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -2100,8 +2100,8 @@ Copyright © 2022 Basecamp, LLC
             this.linkClickObserver.stop();
             this.formSubmitObserver.stop();
         }
-        willFollowLinkToLocation(element) {
-            return this.shouldRedirect(element);
+        willFollowLinkToLocation(element, location, event) {
+            return this.shouldRedirect(element) && this.frameAllowsVisitingLocation(element, location, event);
         }
         followedLinkToLocation(element, url) {
             const frame = this.findFrameElement(element);
@@ -2120,6 +2120,14 @@ Copyright © 2022 Basecamp, 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);
@@ -3348,8 +3356,8 @@ Copyright © 2022 Basecamp, LLC
             if (frame)
                 form.setAttribute("data-turbo-frame", frame.id);
         }
-        willFollowLinkToLocation(element) {
-            return this.shouldInterceptNavigation(element);
+        willFollowLinkToLocation(element, location, event) {
+            return this.shouldInterceptNavigation(element) && this.frameAllowsVisitingLocation(element, location, event);
         }
         followedLinkToLocation(element, location) {
             this.navigateFrame(element, location.href);
@@ -3602,6 +3610,14 @@ Copyright © 2022 Basecamp, 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/frames/frame_controller.d.ts

@@ -47,7 +47,7 @@ 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): boolean;
+    willFollowLinkToLocation(element: Element, location: URL, event: MouseEvent): boolean;
     followedLinkToLocation(element: Element, location: URL): void;
     willSubmitForm(element: HTMLFormElement, submitter?: HTMLElement): boolean;
     formSubmitted(element: HTMLFormElement, submitter?: HTMLElement): void;
@@ -89,6 +89,7 @@ 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

@@ -9,10 +9,11 @@ export declare class FrameRedirector implements LinkClickObserverDelegate, FormS
     constructor(session: Session, element: Element);
     start(): void;
     stop(): void;
-    willFollowLinkToLocation(element: Element): boolean;
+    willFollowLinkToLocation(element: Element, location: URL, event: MouseEvent): boolean;
     followedLinkToLocation(element: Element, url: URL): void;
     willSubmitForm(element: HTMLFormElement, submitter?: HTMLElement): boolean;
     formSubmitted(element: HTMLFormElement, submitter?: HTMLElement): void;
+    private frameAllowsVisitingLocation;
     private shouldSubmit;
     private shouldRedirect;
     private findFrameElement;

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

@@ -7,6 +7,8 @@ declare type MutationAttributeName = string;
 declare type MutationAttributeValue = string | null;
 declare type MutationLog = [MutationAttributeName, Target, MutationAttributeValue];
 export declare function attributeForSelector(page: Page, selector: string, attributeName: string): Promise<string | null>;
+declare type CancellableEvent = "turbo:click" | "turbo:before-visit";
+export declare function cancelNextEvent(page: Page, eventName: CancellableEvent): Promise<void>;
 export declare function clickWithoutScrolling(page: Page, selector: string, options?: {}): Promise<false | void>;
 export declare function clearLocalStorage(page: Page): Promise<void>;
 export declare function disposeAll(...handles: JSHandle[]): Promise<void[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotwired/turbo",
-  "version": "7.2.0-rc.3",
+  "version": "7.2.1",
   "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",
@@ -20,7 +20,7 @@
     "browser",
     "pushstate"
   ],
-  "author": "Basecamp, LLC",
+  "author": "37signals LLC",
   "contributors": [
     "Jeffrey Hardy <jeff@basecamp.com>",
     "Javan Makhmali <javan@javan.us>",