From 66c29490d403ac2ecd8a68a7b1a717c6252c51a1 Mon Sep 17 00:00:00 2001
From: Max Desiatov <max@desiatov.com>
Date: Sat, 1 Aug 2020 19:38:57 +0100
Subject: [PATCH] Fix tests, move DefaultButtonStyle to TokamakCore

---
 Sources/TokamakCore/Styles/ButtonStyle.swift  |  9 ++++++++-
 .../TokamakCore/Views/Buttons/Button.swift    |  8 ++++----
 Sources/TokamakDOM/DOMRenderer.swift          |  1 -
 Sources/TokamakDOM/Styles/ButtonStyle.swift   |  6 ------
 Sources/TokamakTestRenderer/TestView.swift    |  4 +++-
 Tests/TokamakTests/ReconcilerTests.swift      | 20 +++++++++----------
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Sources/TokamakCore/Styles/ButtonStyle.swift b/Sources/TokamakCore/Styles/ButtonStyle.swift
index 6c68e6de8..374d77dd4 100644
--- a/Sources/TokamakCore/Styles/ButtonStyle.swift
+++ b/Sources/TokamakCore/Styles/ButtonStyle.swift
@@ -26,6 +26,13 @@ public struct ButtonStyleConfiguration {
   public let isPressed: Bool
 }
 
+public struct DefaultButtonStyle: ButtonStyle {
+  public init() {}
+  public func makeBody(configuration: ButtonStyleConfiguration) -> some View {
+    configuration.label
+  }
+}
+
 /// This is a helper class that works around absence of "package private" access control in Swift
 public struct _ButtonStyleConfigurationProxy {
   public struct Label {
@@ -75,7 +82,7 @@ public struct _AnyButtonStyle: ButtonStyle {
 
 public enum _ButtonStyleKey: EnvironmentKey {
   public static var defaultValue: _AnyButtonStyle {
-    fatalError("\(self) must have a renderer-provided default value")
+    _AnyButtonStyle(DefaultButtonStyle())
   }
 }
 
diff --git a/Sources/TokamakCore/Views/Buttons/Button.swift b/Sources/TokamakCore/Views/Buttons/Button.swift
index f99872e71..b0898ed9f 100644
--- a/Sources/TokamakCore/Views/Buttons/Button.swift
+++ b/Sources/TokamakCore/Views/Buttons/Button.swift
@@ -36,14 +36,14 @@
 ///       Button("\(counter)", action: { counter += 1 })
 ///     }
 public struct Button<Label>: View where Label: View {
-  let button: _Button<Label>
+  let implementation: _Button<Label>
 
   public init(action: @escaping () -> (), @ViewBuilder label: () -> Label) {
-    button = _Button(action: action, label: label())
+    implementation = _Button(action: action, label: label())
   }
 
   public var body: some View {
-    button
+    implementation
   }
 }
 
@@ -73,6 +73,6 @@ extension Button where Label == Text {
 
 extension Button: ParentView {
   public var children: [AnyView] {
-    (button.label as? GroupView)?.children ?? [AnyView(button.label)]
+    (implementation.label as? GroupView)?.children ?? [AnyView(implementation.label)]
   }
 }
diff --git a/Sources/TokamakDOM/DOMRenderer.swift b/Sources/TokamakDOM/DOMRenderer.swift
index 5577337d0..20356701e 100644
--- a/Sources/TokamakDOM/DOMRenderer.swift
+++ b/Sources/TokamakDOM/DOMRenderer.swift
@@ -23,7 +23,6 @@ extension EnvironmentValues {
   static var defaultEnvironment: Self {
     var environment = EnvironmentValues()
     environment[_ToggleStyleKey] = _AnyToggleStyle(DefaultToggleStyle())
-    environment[_ButtonStyleKey] = _AnyButtonStyle(DefaultButtonStyle())
     environment._defaultAppStorage = LocalStorage.standard
     _DefaultSceneStorageProvider.default = SessionStorage.standard
 
diff --git a/Sources/TokamakDOM/Styles/ButtonStyle.swift b/Sources/TokamakDOM/Styles/ButtonStyle.swift
index 70ab245bd..c64ca0a31 100644
--- a/Sources/TokamakDOM/Styles/ButtonStyle.swift
+++ b/Sources/TokamakDOM/Styles/ButtonStyle.swift
@@ -17,12 +17,6 @@
 
 import TokamakCore
 
-public struct DefaultButtonStyle: ButtonStyle {
-  public func makeBody(configuration: ButtonStyleConfiguration) -> some View {
-    configuration.label
-  }
-}
-
 extension ButtonStyleConfiguration.Label: ViewDeferredToRenderer {
   public var deferredBody: AnyView {
     _ButtonStyleConfigurationProxy.Label(self).content
diff --git a/Sources/TokamakTestRenderer/TestView.swift b/Sources/TokamakTestRenderer/TestView.swift
index a56578499..e1ee07484 100644
--- a/Sources/TokamakTestRenderer/TestView.swift
+++ b/Sources/TokamakTestRenderer/TestView.swift
@@ -27,11 +27,13 @@ public final class TestView: Target {
   /// Parent `TestView` instance that owns this instance as a child
   private weak var parent: TestView?
 
+  public var view: AnyView
+
   /** Initialize a new test view. */
   init<V: View>(_ view: V,
                 _ subviews: [TestView] = []) {
     self.subviews = subviews
-    super.init(view)
+    self.view = AnyView(view)
   }
 
   /** Add a subview to this test view.
diff --git a/Tests/TokamakTests/ReconcilerTests.swift b/Tests/TokamakTests/ReconcilerTests.swift
index 4c9c4ab85..4391f2edd 100644
--- a/Tests/TokamakTests/ReconcilerTests.swift
+++ b/Tests/TokamakTests/ReconcilerTests.swift
@@ -58,7 +58,7 @@ final class ReconcilerTests: XCTestCase {
     )
     let stack = conditional.subviews[0]
     XCTAssertEqual(stack.subviews.count, 2)
-    XCTAssertTrue(stack.subviews[0].view.view is Button<Text>)
+    XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
     XCTAssertTrue(stack.subviews[1].view.view is Text)
     XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "42")
   }
@@ -68,7 +68,7 @@ final class ReconcilerTests: XCTestCase {
     let root = renderer.rootTarget
     let stack = root.subviews[0].subviews[0]
 
-    guard let button = stack.subviews[0].view.view as? Button<Text> else {
+    guard let button = stack.subviews[0].view.view as? _Button<Text> else {
       XCTAssert(false, "counter has no button")
       return
     }
@@ -86,7 +86,7 @@ final class ReconcilerTests: XCTestCase {
       XCTAssert(stack === newStack)
       XCTAssertTrue(stack.view.view is VStack<TupleView<(Button<Text>, Text)>>)
       XCTAssertEqual(stack.subviews.count, 2)
-      XCTAssertTrue(stack.subviews[0].view.view is Button<Text>)
+      XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
       XCTAssertTrue(stack.subviews[1].view.view is Text)
       XCTAssertTrue(originalLabel === newStack.subviews[1])
       XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "43")
@@ -102,7 +102,7 @@ final class ReconcilerTests: XCTestCase {
     let root = renderer.rootTarget
     let stack = root.subviews[0].subviews[0]
 
-    guard let button = stack.subviews[0].view.view as? Button<Text> else {
+    guard let button = stack.subviews[0].view.view as? _Button<Text> else {
       XCTAssert(false, "counter has no button")
       return
     }
@@ -120,12 +120,12 @@ final class ReconcilerTests: XCTestCase {
       XCTAssert(stack === newStack)
       XCTAssertTrue(stack.view.view is VStack<TupleView<(Button<Text>, Text)>>)
       XCTAssertEqual(stack.subviews.count, 2)
-      XCTAssertTrue(stack.subviews[0].view.view is Button<Text>)
+      XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
       XCTAssertTrue(stack.subviews[1].view.view is Text)
       XCTAssertTrue(originalLabel === newStack.subviews[1])
       XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "43")
 
-      guard let button = stack.subviews[0].view.view as? Button<Text> else {
+      guard let button = stack.subviews[0].view.view as? _Button<Text> else {
         XCTAssert(false, "counter has no button")
         return
       }
@@ -139,7 +139,7 @@ final class ReconcilerTests: XCTestCase {
         XCTAssert(stack === newStack)
         XCTAssertTrue(stack.view.view is VStack<TupleView<(Button<Text>, Text)>>)
         XCTAssertEqual(stack.subviews.count, 2)
-        XCTAssertTrue(stack.subviews[0].view.view is Button<Text>)
+        XCTAssertTrue(stack.subviews[0].view.view is _Button<Text>)
         XCTAssertTrue(stack.subviews[1].view.view is Text)
         XCTAssertTrue(originalLabel === newStack.subviews[1])
         XCTAssertEqual((stack.subviews[1].view.view as? Text)?.verbatim, "44")
@@ -156,7 +156,7 @@ final class ReconcilerTests: XCTestCase {
     let root = renderer.rootTarget
 
     let stack = root.subviews[0].subviews[0]
-    guard let button = stack.subviews[0].view.view as? Button<Text> else {
+    guard let button = stack.subviews[0].view.view as? _Button<Text> else {
       XCTAssert(false, "counter has no button")
       return
     }
@@ -167,7 +167,7 @@ final class ReconcilerTests: XCTestCase {
 
     testScheduler {
       // rerender completed here, schedule another one
-      guard let button = stack.subviews[0].view.view as? Button<Text> else {
+      guard let button = stack.subviews[0].view.view as? _Button<Text> else {
         XCTAssert(false, "counter has no button")
         return
       }
@@ -175,7 +175,7 @@ final class ReconcilerTests: XCTestCase {
       button.action()
 
       testScheduler {
-        guard let button = stack.subviews[0].view.view as? Button<Text> else {
+        guard let button = stack.subviews[0].view.view as? _Button<Text> else {
           XCTAssert(false, "counter has no button")
           return
         }