Update CoreGlue (#227)

* Update CoreGlue API

* Add OpenSwiftUIGlueTest

* Fix CoreGlue API on non-Darwin platform issue

Author: Kyle-Ye

Sources/OpenSwiftUI/CoreGlue/OpenSwiftUIGlue.swift Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift

@@ -5,13 +5,13 @@
 //  Audited for iOS 18.0
 //  Status: WIP
 
+public import Foundation
 @_spi(ForOpenSwiftUIOnly)
 public import OpenSwiftUICore
+public import OpenGraphShims
 import COpenSwiftUI
 
-#if canImport(Darwin)
-
-public import Foundation
+// MARK: - OpenSwiftUIGlue
 
 @_spi(ForOpenSwiftUIOnly)
 @_silgen_name("OpenSwiftUIGlueClass")
@@ -20,29 +20,62 @@ public func OpenSwiftUIGlueClass() -> CoreGlue.Type {
 }
 
 @_spi(ForOpenSwiftUIOnly)
+#if canImport(ObjectiveC)
 @objc(OpenSwiftUIGlue)
+#endif
 final public class OpenSwiftUIGlue: CoreGlue {
+    override final public func maxVelocity(_ velocity: CGFloat) {
+        ViewGraph.current.nextUpdate.views.maxVelocity(velocity)
+    }
+
+    override final public func nextUpdate(nextTime: Time, interval: Double, reason: UInt32?) {
+        ViewGraph.current.nextUpdate.views.at(nextTime)
+        ViewGraph.current.nextUpdate.views.interval(interval, reason: reason)
+    }
+
+    override final public func hasTestHost() -> Bool {
+        _TestApp.host != nil
+    }
+
+    override final public func isInstantiated(graph: Graph) -> Bool {
+        graph.viewGraph().isInstantiated
+    }
+
     override final public var defaultImplicitRootType: DefaultImplicitRootTypeResult {
         DefaultImplicitRootTypeResult(_VStackLayout.self)
     }
 
+    override final public var defaultSpacing: CGSize {
+        CGSize(width: 8, height: 8)
+    }
+
     override final public func makeDefaultLayoutComputer() -> MakeDefaultLayoutComputerResult {
         MakeDefaultLayoutComputerResult(value: ViewGraph.current.$defaultLayoutComputer)
     }
+
+    override final public func makeDefaultLayoutComputer(graph: Graph) -> MakeDefaultLayoutComputerResult {
+        MakeDefaultLayoutComputerResult(value: graph.viewGraph().$defaultLayoutComputer)
+    }
+
+    // TODO
 }
 
 @_spi(ForOpenSwiftUIOnly)
 @available(*, unavailable)
 extension OpenSwiftUIGlue: Sendable {}
 
+// MARK: - OpenSwiftUIGlue2
+
 @_spi(ForOpenSwiftUIOnly)
 @_silgen_name("OpenSwiftUIGlue2Class")
 public func OpenSwiftUIGlue2Class() -> CoreGlue2.Type {
     OpenSwiftUIGlue2.self
 }
 
 @_spi(ForOpenSwiftUIOnly)
+#if canImport(ObjectiveC)
 @objc(OpenSwiftUIGlue2)
+#endif
 final public class OpenSwiftUIGlue2: CoreGlue2 {
     #if os(iOS)
     override public final func initializeTestApp() {
@@ -93,4 +126,3 @@ final public class OpenSwiftUIGlue2: CoreGlue2 {
 @_spi(ForOpenSwiftUIOnly)
 @available(*, unavailable)
 extension OpenSwiftUIGlue2: Sendable {}
-#endif

Sources/OpenSwiftUICore/CoreGlue/CoreGlue.swift

@@ -19,14 +19,10 @@ extension _ViewInputs {
         guard requestsLayoutComputer else {
             return outputs
         }
-        #if canImport(Darwin)
         let defaultLayoutComputer = CoreGlue.shared.makeDefaultLayoutComputer().value
         @IndirectAttribute(source: defaultLayoutComputer)
         var indirect: LayoutComputer
         outputs.layoutComputer = $indirect
-        #else
-        preconditionFailure("#39")
-        #endif
         return outputs
     }
 }

Sources/OpenSwiftUICore/Data/Preference/View_Indirect.swift

@@ -34,31 +34,23 @@ public struct _TestApp {
         package init() {}
 
         package var body: some View {
-            #if canImport(Darwin)
             CoreGlue2.shared.makeRootView(
                 base: state.testView,
                 rootFocusScope: rootFocusScope
             )
-            #else
-            state.testView
-            #endif
         }
     }
 
     package static let defaultEnvironment: EnvironmentValues = {
         var environment = EnvironmentValues()
-        #if canImport(Darwin)
         CoreGlue2.shared.configureDefaultEnvironment(&environment)
-        #endif
         // TODO
         return environment
     }()
 
     /// Initialize a `_TestApp` for running tests.
     public init() {
-        #if canImport(Darwin)
         CoreGlue2.shared.initializeTestApp()
-        #endif
     }
 
     package static var host: (any TestHost)?

Sources/OpenSwiftUICore/Test/TestApp.swift

@@ -58,11 +58,7 @@ public enum DynamicTypeSize: Hashable, Comparable, CaseIterable, Sendable {
     }
 
     package static var systemDefault: DynamicTypeSize {
-        #if canImport(Darwin)
         CoreGlue2.shared.systemDefaultDynamicTypeSize
-        #else
-        .large
-        #endif
     }
 }