Revert "Communicate Visit direction with `html[data-turbo-visit-direc…

…tion]` (hotwired#1007)"

This reverts commit ac00359.

src/core/drive/history.js

@@ -6,7 +6,6 @@ export class History {
   restorationData = {}
   started = false
   pageLoaded = false
-  currentIndex = 0
 
   constructor(delegate) {
     this.delegate = delegate
@@ -16,7 +15,6 @@ export class History {
     if (!this.started) {
       addEventListener("popstate", this.onPopState, false)
       addEventListener("load", this.onPageLoad, false)
-      this.currentIndex = history.state?.turbo?.restorationIndex || 0
       this.started = true
       this.replace(new URL(window.location.href))
     }
@@ -39,9 +37,7 @@ export class History {
   }
 
   update(method, location, restorationIdentifier = uuid()) {
-    if (method === history.pushState) ++this.currentIndex
-
-    const state = { turbo: { restorationIdentifier, restorationIndex: this.currentIndex } }
+    const state = { turbo: { restorationIdentifier } }
     method.call(history, state, "", location.href)
     this.location = location
     this.restorationIdentifier = restorationIdentifier
@@ -85,11 +81,9 @@ export class History {
       const { turbo } = event.state || {}
       if (turbo) {
         this.location = new URL(window.location.href)
-        const { restorationIdentifier, restorationIndex } = turbo
+        const { restorationIdentifier } = turbo
         this.restorationIdentifier = restorationIdentifier
-        const direction = restorationIndex > this.currentIndex ? "forward" : "back"
-        this.delegate.historyPoppedToLocationWithRestorationIdentifierAndDirection(this.location, restorationIdentifier, direction)
-        this.currentIndex = restorationIndex
+        this.delegate.historyPoppedToLocationWithRestorationIdentifier(this.location, restorationIdentifier)
       }
     }
   }

src/core/drive/visit.js

@@ -36,12 +36,6 @@ export const SystemStatusCode = {
   contentTypeMismatch: -2
 }
 
-export const Direction = {
-  advance: "forward",
-  restore: "back",
-  replace: "none"
-}
-
 export class Visit {
   identifier = uuid() // Required by turbo-ios
   timingMetrics = {}
@@ -71,8 +65,7 @@ export class Visit {
       willRender,
       updateHistory,
       shouldCacheSnapshot,
-      acceptsStreamResponse,
-      direction
+      acceptsStreamResponse
     } = {
       ...defaultOptions,
       ...options
@@ -90,7 +83,6 @@ export class Visit {
     this.scrolled = !willRender
     this.shouldCacheSnapshot = shouldCacheSnapshot
     this.acceptsStreamResponse = acceptsStreamResponse
-    this.direction = direction || Direction[action]
   }
 
   get adapter() {

src/core/session.js

@@ -139,12 +139,11 @@ export class Session {
 
   // History delegate
 
-  historyPoppedToLocationWithRestorationIdentifierAndDirection(location, restorationIdentifier, direction) {
+  historyPoppedToLocationWithRestorationIdentifier(location, restorationIdentifier) {
     if (this.enabled) {
       this.navigator.startVisit(location, restorationIdentifier, {
         action: "restore",
-        historyChanged: true,
-        direction
+        historyChanged: true
       })
     } else {
       this.adapter.pageInvalidated({
@@ -200,7 +199,6 @@ export class Session {
   visitStarted(visit) {
     if (!visit.acceptsStreamResponse) {
       markAsBusy(document.documentElement)
-      this.view.markVisitDirection(visit.direction)
     }
     extendURLWithDeprecatedProperties(visit.location)
     if (!visit.silent) {
@@ -209,7 +207,6 @@ export class Session {
   }
 
   visitCompleted(visit) {
-    this.view.unmarkVisitDirection()
     clearBusyState(document.documentElement)
     this.notifyApplicationAfterPageLoad(visit.getTimingMetrics())
   }

src/core/view.js

@@ -99,14 +99,6 @@ export class View {
     }
   }
 
-  markVisitDirection(direction) {
-    this.element.setAttribute("data-turbo-visit-direction", direction)
-  }
-
-  unmarkVisitDirection() {
-    this.element.removeAttribute("data-turbo-visit-direction")
-  }
-
   async renderSnapshot(renderer) {
     await renderer.render()
   }

src/tests/fixtures/visit.html

@@ -13,7 +13,6 @@
     <section>
       <h1>Visit</h1>
       <p><a id="same-origin-link" href="/src/tests/fixtures/one.html">Same-origin link</a></p>
-      <p><a id="same-origin-replace-link" href="/src/tests/fixtures/one.html" data-turbo-action="replace">Same-origin replace link</a></p>
       <p><a id="same-origin-link-search-params" href="/src/tests/fixtures/one.html?key=value">Same-origin link with ?key=value</a></p>
       <p><a id="sample-response" href="/src/tests/fixtures/one.html">Sample response</a></p>
       <p><a id="same-page-link" href="/src/tests/fixtures/visit.html">Same page link</a></p>

src/tests/functional/visit_tests.js

@@ -6,16 +6,13 @@ import {
   getSearchParam,
   isScrolledToSelector,
   isScrolledToTop,
-  nextAttributeMutationNamed,
   nextBeat,
   nextEventNamed,
   noNextAttributeMutationNamed,
   pathname,
   readEventLogs,
-  resetMutationLogs,
   scrollToSelector,
   visitAction,
-  waitUntilNoSelector,
   willChangeBody
 } from "../helpers/page"
 
@@ -223,55 +220,6 @@ test("Visit with network error", async ({ page }) => {
   await nextEventNamed(page, "turbo:fetch-request-error")
 })
 
-test("Visit direction data attribute when clicking a link", async ({ page }) => {
-  page.click("#same-origin-link")
-  await assertVisitDirectionAttribute(page, "forward")
-})
-
-test("Visit direction data attribute when navigating back", async ({ page }) => {
-  await page.click("#same-origin-link")
-  await nextEventNamed(page, "turbo:load")
-
-  await resetMutationLogs(page)
-
-  page.goBack()
-
-  await assertVisitDirectionAttribute(page, "back")
-})
-
-test("Visit direction attribute when navigating forward", async ({ page }) => {
-  await page.click("#same-origin-link")
-  await nextEventNamed(page, "turbo:load")
-  await page.goBack()
-  await nextEventNamed(page, "turbo:load")
-
-  page.goForward()
-
-  await assertVisitDirectionAttribute(page, "forward")
-})
-
-test("Visit direction attribute on a replace visit", async ({ page }) => {
-  page.click("#same-origin-replace-link")
-
-  await assertVisitDirectionAttribute(page, "none")
-})
-
-test("Turbo history state after a reload", async ({ page }) => {
-  await page.click("#same-origin-link")
-  await nextEventNamed(page, "turbo:load")
-  await page.reload()
-  assert.equal(
-    await page.evaluate(() => window.history.state.turbo.restorationIndex),
-    1,
-    "restorationIndex is persisted between reloads"
-  )
-})
-
 async function visitLocation(page, location) {
   return page.evaluate((location) => window.Turbo.visit(location), location)
 }
-
-async function assertVisitDirectionAttribute(page, direction) {
-  assert.equal(await nextAttributeMutationNamed(page, "html", "data-turbo-visit-direction"), direction)
-  await waitUntilNoSelector(page, "[data-turbo-visit-direction]")
-}

src/tests/helpers/page.js

@@ -166,12 +166,6 @@ export function propertyForSelector(page, selector, propertyName) {
   return page.locator(selector).evaluate((element, propertyName) => element[propertyName], propertyName)
 }
 
-export function resetMutationLogs(page) {
-  return page.evaluate(() => {
-    window.mutationLogs = []
-  })
-}
-
 async function readArray(page, identifier, length) {
   return page.evaluate(
     ({ identifier, length }) => {