turbo-rails 2.0.0.pre.rc.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9fabf188a1b8db9d4a2f15742cbd342293368ba0bb3d23692fa2f1e922e79d
-  data.tar.gz: 3080cea594ecd3f05d1d80f515c919992f5e1d8afcbc921b656879ddcda76433
+  metadata.gz: 1b66ce6805bd7f4ed7bf032d98080748a3d123959ef81940ca62d1c394b69d79
+  data.tar.gz: 2245107df78ba671eb787f683cc77ac508778fd3832c3396c0d52d4be6f9d64c
 SHA512:
-  metadata.gz: bdb2fcb4ed4f3d9b63ff6d965b8fa17a0e3b9e004546289f7a4f10b14da66f5c94ba3d5d6ca4c0e9bcbad7253d2250c47034bd4540d5bc1a962a333591892137
-  data.tar.gz: 37c771f8632419220a3a017c007867926adf12185cd6de833da527990bf8198a383eea645b53cee3ce38ffefc6ac4a25267b215272957e23aac07948d050e1d0
+  metadata.gz: e6d95bdd5abce68fda1895b52b53474a8c0306545a238af6b0caba6f20354a7e48add0a6c662cd4861152fb0b293468f2f3c2a0c67002c9926922a19c4e734aa
+  data.tar.gz: e9daf44cbd3abf3c120aaf0b7bd58e13feb58f60c8738a57624c9721b6965636214a7e44a47eff5f752890b6df5915dbd852eb58d6449326aaa3969b1e3a91f7

data/app/assets/javascripts/turbo.js

@@ -1,5 +1,5 @@
 /*!
-Turbo 8.0.0-rc.2
+Turbo 8.0.0
 Copyright © 2024 37signals LLC
  */
 (function(prototype) {
@@ -2569,8 +2569,7 @@ class History {
 
 class LinkPrefetchObserver {
   started=false;
-  hoverTriggerEvent="mouseenter";
-  touchTriggerEvent="touchstart";
+  #prefetchedLink=null;
   constructor(delegate, eventTarget) {
     this.delegate = delegate;
     this.eventTarget = eventTarget;
@@ -2587,11 +2586,11 @@ class LinkPrefetchObserver {
   }
   stop() {
     if (!this.started) return;
-    this.eventTarget.removeEventListener(this.hoverTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.removeEventListener("mouseenter", this.#tryToPrefetchRequest, {
       capture: true,
       passive: true
     });
-    this.eventTarget.removeEventListener(this.touchTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.removeEventListener("mouseleave", this.#cancelRequestIfObsolete, {
       capture: true,
       passive: true
     });
@@ -2599,11 +2598,11 @@ class LinkPrefetchObserver {
     this.started = false;
   }
   #enable=() => {
-    this.eventTarget.addEventListener(this.hoverTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.addEventListener("mouseenter", this.#tryToPrefetchRequest, {
       capture: true,
       passive: true
     });
-    this.eventTarget.addEventListener(this.touchTriggerEvent, this.#tryToPrefetchRequest, {
+    this.eventTarget.addEventListener("mouseleave", this.#cancelRequestIfObsolete, {
       capture: true,
       passive: true
     });
@@ -2611,21 +2610,26 @@ class LinkPrefetchObserver {
     this.started = true;
   };
   #tryToPrefetchRequest=event => {
-    if (getMetaContent("turbo-prefetch") !== "true") return;
+    if (getMetaContent("turbo-prefetch") === "false") return;
     const target = event.target;
     const isLink = target.matches && target.matches("a[href]:not([target^=_]):not([download])");
     if (isLink && this.#isPrefetchable(target)) {
       const link = target;
       const location = getLocationForLink(link);
       if (this.delegate.canPrefetchRequestToLocation(link, location)) {
+        this.#prefetchedLink = link;
         const fetchRequest = new FetchRequest(this, FetchMethod.get, location, new URLSearchParams, target);
         prefetchCache.setLater(location.toString(), fetchRequest, this.#cacheTtl);
-        link.addEventListener("mouseleave", (() => prefetchCache.clear()), {
-          once: true
-        });
       }
     }
   };
+  #cancelRequestIfObsolete=event => {
+    if (event.target === this.#prefetchedLink) this.#cancelPrefetchRequest();
+  };
+  #cancelPrefetchRequest=() => {
+    prefetchCache.clear();
+    this.#prefetchedLink = null;
+  };
   #tryToUsePrefetchedRequest=event => {
     if (event.target.tagName !== "FORM" && event.detail.fetchOptions.method === "get") {
       const cached = prefetchCache.get(event.detail.url.toString());
@@ -2658,7 +2662,14 @@ class LinkPrefetchObserver {
   }
   #isPrefetchable(link) {
     const href = link.getAttribute("href");
-    if (!href || href === "#" || link.getAttribute("data-turbo") === "false" || link.getAttribute("data-turbo-prefetch") === "false") {
+    if (!href || href.startsWith("#") || link.getAttribute("data-turbo") === "false" || link.getAttribute("data-turbo-prefetch") === "false") {
+      return false;
+    }
+    const event = dispatch("turbo:before-prefetch", {
+      target: link,
+      cancelable: true
+    });
+    if (event.defaultPrevented) {
       return false;
     }
     if (link.origin !== document.location.origin) {