chore: Use sessionStorage to store requested turbo frame

stimulusreflex · Jul 8, 2024 · c8c92aa · c8c92aa
1 parent a998ebf
commit c8c92aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/javascript/elements/futurism_utils.js b/javascript/elements/futurism_utils.js
@@ -1,7 +1,7 @@
 /* global IntersectionObserver, CustomEvent, setTimeout */
 
 const dispatchAppearEvent = (entry, observer = null) => {
-  if (!window.Futurism) {
+  if (!window.Futurism?.subscription) {
     return () => {
       setTimeout(() => dispatchAppearEvent(entry, observer)(), 1)
     }

diff --git a/javascript/elements/index.js b/javascript/elements/index.js
@@ -60,8 +60,8 @@ const restorePlaceholders = e => {
   // if the TF request has been promoted to an advance action
   // (data-turbo-action="advance"), this callback will fire inadvertently
   // but the whole page will not be exchanged as in a regular TD visit
-  if (window.Futurism.requestedTurboFrame) {
-    delete window.Futurism.requestedTurboFrame
+  if (sessionStorage.getItem('requested-turbo-frame')) {
+    delete sessionStorage.removeItem('requested-turbo-frame')
     return
   }
 
@@ -87,7 +87,7 @@ const storeRequestedTurboFrame = e => {
   if (!headers['Turbo-Frame'] || headers['X-Sec-Purpose'] === 'prefetch') return
 
   // we store the frame ID in case the incoming request was referencing one
-  window.Futurism.requestedTurboFrame = headers['Turbo-Frame']
+  sessionStorage.setItem('requested-turbo-frame', headers['Turbo-Frame'])
 }
 
 export const initializeElements = () => {