Revert #553 (#596)

hotwired · Jun 3, 2022 · f932cb4 · f932cb4
1 parent 28b6e31
commit f932cb4
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 77 deletions.
diff --git a/src/core/drive/page_renderer.ts b/src/core/drive/page_renderer.ts
@@ -2,8 +2,6 @@ import { Renderer } from "../renderer"
 import { PageSnapshot } from "./page_snapshot"
 import { ReloadReason } from "../native/browser_adapter"
 
-const INTERNAL_ATTRIBUTES = ["aria-busy", "data-turbo-preview"]
-
 export class PageRenderer extends Renderer<HTMLBodyElement, PageSnapshot> {
   get shouldRender() {
     return this.newSnapshot.isVisitable && this.trackedElementsAreIdentical
@@ -25,7 +23,6 @@ export class PageRenderer extends Renderer<HTMLBodyElement, PageSnapshot> {
 
   prepareToRender() {
     this.mergeHead()
-    this.updateHtmlElementAttributes()
   }
 
   async render() {
@@ -53,29 +50,13 @@ export class PageRenderer extends Renderer<HTMLBodyElement, PageSnapshot> {
     return this.newSnapshot.element
   }
 
-  get newHtmlElement() {
-    return this.newSnapshot.htmlElement
-  }
-
   mergeHead() {
     this.copyNewHeadStylesheetElements()
     this.copyNewHeadScriptElements()
     this.removeCurrentHeadProvisionalElements()
     this.copyNewHeadProvisionalElements()
   }
 
-  updateHtmlElementAttributes() {
-    for (const attr of document.documentElement.attributes) {
-      if (!this.newElement.hasAttribute(attr.nodeName) && !INTERNAL_ATTRIBUTES.includes(attr.nodeName)) {
-        document.documentElement.removeAttribute(attr.nodeName)
-      }
-    }
-
-    for (const attr of this.newHtmlElement.attributes) {
-      document.documentElement.setAttribute(attr.nodeName, attr.nodeValue!)
-    }
-  }
-
   replaceBody() {
     this.preservingPermanentElements(() => {
       this.activateNewBody()

diff --git a/src/core/drive/page_snapshot.ts b/src/core/drive/page_snapshot.ts
@@ -12,21 +12,19 @@ export class PageSnapshot extends Snapshot<HTMLBodyElement> {
     return this.fromDocument(element.ownerDocument)
   }
 
-  static fromDocument({ head, body, documentElement }: Document) {
-    return new this(body as HTMLBodyElement, new HeadSnapshot(head), documentElement as HTMLHtmlElement)
+  static fromDocument({ head, body }: Document) {
+    return new this(body as HTMLBodyElement, new HeadSnapshot(head))
   }
 
   readonly headSnapshot: HeadSnapshot
-  readonly htmlElement: HTMLHtmlElement
 
-  constructor(element: HTMLBodyElement, headSnapshot: HeadSnapshot, htmlElement: HTMLHtmlElement) {
+  constructor(element: HTMLBodyElement, headSnapshot: HeadSnapshot) {
     super(element)
     this.headSnapshot = headSnapshot
-    this.htmlElement = htmlElement
   }
 
   clone() {
-    return new PageSnapshot(this.element.cloneNode(true), this.headSnapshot, this.htmlElement)
+    return new PageSnapshot(this.element.cloneNode(true), this.headSnapshot)
   }
 
   get headElement() {

diff --git a/src/core/drive/page_view.ts b/src/core/drive/page_view.ts
@@ -18,7 +18,9 @@ export class PageView extends View<Element, PageSnapshot, PageViewRenderer, Page
 
   renderPage(snapshot: PageSnapshot, isPreview = false, willRender = true) {
     const renderer = new PageRenderer(this.snapshot, snapshot, isPreview, willRender)
-    if (!renderer.shouldRender) { this.forceReloaded = true }
+    if (!renderer.shouldRender) {
+      this.forceReloaded = true
+    }
     return this.render(renderer)
   }
 

diff --git a/src/tests/fixtures/html_attributes.html b/src/tests/fixtures/html_attributes.html
diff --git a/src/tests/fixtures/html_attributes_two.html b/src/tests/fixtures/html_attributes_two.html
diff --git a/src/tests/fixtures/target.html b/src/tests/fixtures/target.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Target</title>
+    <script src="/dist/turbo.es2017-umd.js" data-turbo-track="reload"></script>
+    <script src="/src/tests/fixtures/test.js"></script>
+  </head>
+  <body>
+    <h1>Target</h1>
+
+    <div id="target">
+      Targeted element
+    </div>
+  </body>
+</html>
diff --git a/src/tests/functional/navigation_tests.ts b/src/tests/functional/navigation_tests.ts
@@ -49,9 +49,9 @@ export class NavigationTests extends TurboDriveTestCase {
       "sets [aria-busy] on the document element"
     )
     this.assert.equal(
-      await this.nextAttributeMutationNamed("one", "aria-busy"),
+      await this.nextAttributeMutationNamed("html", "aria-busy"),
       null,
-      "removes [aria-busy] from the updated document element"
+      "removes [aria-busy] from the document element"
     )
   }
 

diff --git a/src/tests/functional/rendering_tests.ts b/src/tests/functional/rendering_tests.ts
@@ -78,9 +78,11 @@ export class RenderingTests extends TurboDriveTestCase {
 
     await this.remote.execute(() => localStorage.setItem("scrolls", "false"))
 
-    this.remote.execute(() => addEventListener("scroll", () => {
-      localStorage.setItem("scrolls", "true")
-    }))
+    this.remote.execute(() =>
+      addEventListener("scroll", () => {
+        localStorage.setItem("scrolls", "true")
+      })
+    )
 
     this.clickSelector("#below-the-fold-visit-control-reload-link")
 

diff --git a/src/tests/functional/visit_tests.ts b/src/tests/functional/visit_tests.ts
@@ -123,22 +123,6 @@ export class VisitTests extends TurboDriveTestCase {
     this.assert.notOk(await this.hasSelector("some-cached-element"))
   }
 
-  async "test updates HTML element attributes"() {
-    await this.visitLocation("/src/tests/fixtures/html_attributes.html")
-    await this.nextBeat
-
-    this.assert.equal(await this.getDocumentElementAttribute("class"), "html-attributes")
-    this.assert.equal(await this.getDocumentElementAttribute("data-attribute"), "attr")
-    this.assert.equal(await this.getDocumentElementAttribute("data-other-attribute"), null)
-
-    await this.clickSelector("#link")
-    await this.nextBeat
-
-    this.assert.equal(await this.getDocumentElementAttribute("class"), "html-attributes-two")
-    this.assert.equal(await this.getDocumentElementAttribute("data-attribute"), "attr-two")
-    this.assert.equal(await this.getDocumentElementAttribute("data-other-attribute"), "other-attr")
-  }
-
   async visitLocation(location: string) {
     this.remote.execute((location: string) => window.Turbo.visit(location), [location])
   }