Fix rootEnvironment not merged with .defaultEnvironment (#461)

* Make actual use of `rootEnvironment` passed into functions, falling back to `.defaultEnvironment` * Add `.merge(_:)`/`.merging(_:)` to `EnvironmentValues` * Merge `.defaultEnvironment` with `rootEnvironment` * Add `@_spi(TokamakCore)` protection for `EnvironmentValues.merge(_:)`/`.merging(_:)`
TokamakUI · Jan 3, 2022 · a9addc8 · a9addc8
1 parent 077c0cd
commit a9addc8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/Sources/TokamakCore/Environment/EnvironmentValues.swift b/Sources/TokamakCore/Environment/EnvironmentValues.swift
@@ -43,6 +43,22 @@ public struct EnvironmentValues: CustomStringConvertible {
       values[bindable] = newValue
     }
   }
+
+  @_spi(TokamakCore)
+  public mutating func merge(_ other: Self?) {
+    if let other = other {
+      values.merge(other.values) { existing, new in
+        new
+      }
+    }
+  }
+
+  @_spi(TokamakCore)
+  public func merging(_ other: Self?) -> Self {
+    var merged = self
+    merged.merge(other)
+    return merged
+  }
 }
 
 struct IsEnabledKey: EnvironmentKey {

diff --git a/Sources/TokamakDOM/DOMRenderer.swift b/Sources/TokamakDOM/DOMRenderer.swift
@@ -100,7 +100,7 @@ final class DOMRenderer: Renderer {
     reconciler = StackReconciler(
       app: app,
       target: DOMNode(ref),
-      environment: .defaultEnvironment,
+      environment: .defaultEnvironment.merging(rootEnvironment),
       renderer: self
     ) { scheduler.schedule(options: nil, $0) }
   }

diff --git a/Sources/TokamakGTK/GTKRenderer.swift b/Sources/TokamakGTK/GTKRenderer.swift
@@ -17,7 +17,7 @@
 
 import CGTK
 import Dispatch
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 extension EnvironmentValues {
   /// Returns default settings for the GTK environment
@@ -56,7 +56,7 @@ final class GTKRenderer: Renderer {
         self.reconciler = StackReconciler(
           app: app,
           target: Widget(window),
-          environment: .defaultEnvironment,
+          environment: .defaultEnvironment.merging(rootEnvironment),
           renderer: self,
           scheduler: { next in
             DispatchQueue.main.async {

diff --git a/Sources/TokamakStaticHTML/StaticHTMLRenderer.swift b/Sources/TokamakStaticHTML/StaticHTMLRenderer.swift
@@ -15,7 +15,7 @@
 //  Created by Carson Katri on 7/20/20.
 //
 
-import TokamakCore
+@_spi(TokamakCore) import TokamakCore
 
 extension EnvironmentValues {
   /// Returns default settings for the static HTML environment
@@ -90,7 +90,7 @@ public final class StaticHTMLRenderer: Renderer {
     reconciler = StackReconciler(
       view: view,
       target: rootTarget,
-      environment: .defaultEnvironment,
+      environment: .defaultEnvironment.merging(rootEnvironment),
       renderer: self,
       scheduler: { _ in
         fatalError("Stateful apps cannot be created with TokamakStaticHTML")
@@ -104,7 +104,7 @@ public final class StaticHTMLRenderer: Renderer {
     reconciler = StackReconciler(
       app: app,
       target: rootTarget,
-      environment: .defaultEnvironment,
+      environment: .defaultEnvironment.merging(rootEnvironment),
       renderer: self,
       scheduler: { _ in
         fatalError("Stateful apps cannot be created with TokamakStaticHTML")