Update ViewRender (#144)

* Add RendererConfiguration

* Add PlatformViewDefinition

* Update ViewRenderer

* Add GraphicsRenderer

* Add empty ViewRasterizer implementation

* Add ViewGraphFeature and update ViewGraphDelegate

* Add ViewRenderingPhase and update ViewRenderHostProperties

* Add EmptyViewRendererHost

* Update ViewRendererHost

* Update PreferenceBridge

* Fix WASI build issue

Author: Kyle-Ye

Package.swift

@@ -164,13 +164,15 @@ let package = Package(
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
+                .define("_WASI_EMULATED_SIGNAL", .when(platforms: [.wasi])),
             ]
         ),
         .target(
             name: "COpenSwiftUICore",
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
+                .define("_WASI_EMULATED_SIGNAL", .when(platforms: [.wasi])),
             ]
         ),
         .binaryTarget(name: "CoreServices", path: "PrivateFrameworks/CoreServices.xcframework"),

[email protected]

@@ -160,13 +160,15 @@ let package = Package(
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
+                .define("_WASI_EMULATED_SIGNAL", .when(platforms: [.wasi])),
             ]
         ),
         .target(
             name: "COpenSwiftUICore",
             cSettings: [
                 .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
                 .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
+                .define("_WASI_EMULATED_SIGNAL", .when(platforms: [.wasi])),
             ]
         ),
         .binaryTarget(name: "CoreServices", path: "PrivateFrameworks/CoreServices.xcframework"),

Sources/COpenSwiftUICore/include/OpenSwiftUIBase.h

@@ -8,6 +8,7 @@
 #ifndef OpenSwiftUIBase_h
 #define OpenSwiftUIBase_h
 
+#include <CoreFoundation/CoreFoundation.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -67,4 +68,6 @@
 # define OPENSWIFTUI_SWIFT_NAME(_name)
 #endif
 
+#define OPENSWIFTUI_ENUM CF_ENUM
+
 #endif /* OpenSwiftUIBase_h */

Sources/COpenSwiftUICore/include/ViewSystem.h

@@ -0,0 +1,18 @@
+//
+//  ViewSystem.h
+//  COpenSwiftUICore
+//  Audited for RELEASE_2024
+//  Status: Complete
+
+#ifndef ViewSystem_h
+#define ViewSystem_h
+
+#include "OpenSwiftUIBase.h"
+
+typedef OPENSWIFTUI_ENUM(uint8_t, ViewSystem) {
+    ViewSystemUIView,
+    ViewSystemNSView,
+    ViewSystem_2,
+};
+
+#endif /* ViewSystem_h */

Sources/OpenSwiftUI/Integration/UIKit/UIHostingView.swift

@@ -154,6 +154,44 @@ open class _UIHostingView<Content>: UIView where Content: View {
 }
 
 extension _UIHostingView: ViewRendererHost {
+    package var renderingPhase: OpenSwiftUICore.ViewRenderingPhase {
+        get {
+            fatalError("TODO")
+        }
+        set(newValue) {
+            fatalError("TODO")
+        }
+    }
+    
+    package var externalUpdateCount: Int {
+        get {
+            fatalError("TODO")
+        }
+        set(newValue) {
+            fatalError("TODO")
+        }
+    }
+    
+    package func updateEnvironment() {
+        fatalError("TODO")
+    }
+    
+    package func updateSize() {
+        fatalError("TODO")
+    }
+    
+    package func updateSafeArea() {
+        fatalError("TODO")
+    }
+    
+    package func updateScrollableContainerSize() {
+        fatalError("TODO")
+    }
+    
+    package func renderDisplayList(_ list: DisplayList, asynchronously: Bool, time: Time, nextTime: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time {
+        fatalError("TODO")
+    }
+    
     package func addImplicitPropertiesNeedingUpdate(to _: inout ViewRendererHostProperties) {}
 
     package func updateRootView() {

Sources/OpenSwiftUI/Render/UIViewPlatformViewDefinition.swift

@@ -0,0 +1,13 @@
+//
+//  UIViewPlatformViewDefinition.swift
+//  OpenSwiftUI
+//
+//  Audited for RELEASE_2024
+//  Status: WIP
+
+@_spi(DisplayList_ViewSystem) internal import OpenSwiftUICore
+
+final class UIViewPlatformViewDefinition: PlatformViewDefinition, @unchecked Sendable {
+    override final class var system: PlatformViewDefinition.System { .uiView }
+    // TODO
+}

Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift

@@ -1,15 +1,17 @@
 //
 //  PreferenceBridge.swift
-//  OpenSwiftUI
+//  OpenSwiftUICore
 //
-//  Audited for RELEASE_2021
-//  Status: Complete
-//  ID: A9FAE381E99529D5274BA37A9BC9B074
+//  Audited for RELEASE_2024
+//  Status: TO BE AUDITED
+//  ID: A9FAE381E99529D5274BA37A9BC9B074 (RELEASE_2021)
+//  ID: DF57A19C61B44C613EB77C1D47FC679A (RELEASE_2024)
 
 internal import OpenGraphShims
 
 package final class PreferenceBridge {
-    unowned let viewGraph: ViewGraph
+    weak var viewGraph: ViewGraph?
+    var isValid: Bool = true
     private(set) var children: [Unmanaged<ViewGraph>] = []
     var requestedPreferences = PreferenceKeys()
     var bridgedViewInputs = PropertyList()
@@ -23,9 +25,15 @@ package final class PreferenceBridge {
     }
 
     init() {
-        viewGraph = GraphHost.currentHost as! ViewGraph
+        viewGraph = ViewGraph.current
     }
 
+    deinit {
+        if isValid { invalidate() }
+    }
+    
+    // FIXME: TO BE AUDITED
+    
     #if canImport(Darwin) // FIXME: See #39
     func addValue(_ value: AnyAttribute, for keyType: AnyPreferenceKey.Type) {
         struct AddValue: PreferenceKeyVisitor {
@@ -48,7 +56,7 @@ package final class PreferenceBridge {
         }
         var visitor = AddValue(combiner: combiner, value: value)
         keyType.visitKey(&visitor)
-        viewGraph.graphInvalidation(from: value)
+        viewGraph?.graphInvalidation(from: value)
     }
 
     func removeValue(_ value: AnyAttribute, for keyType: AnyPreferenceKey.Type, isInvalidating: Bool) {
@@ -78,7 +86,7 @@ package final class PreferenceBridge {
         var visitor = RemoveValue(combiner: combiner, value: value)
         keyType.visitKey(&visitor)
         if visitor.changed {
-            viewGraph.graphInvalidation(from: isInvalidating ? nil : value)
+            viewGraph?.graphInvalidation(from: isInvalidating ? nil : value)
         }
     }
 
@@ -92,7 +100,7 @@ package final class PreferenceBridge {
         ) { combiner in
             combiner.addChild(keys: keys, values: values)
         }
-        viewGraph.graphInvalidation(from: combiner.identifier)
+        viewGraph?.graphInvalidation(from: combiner.identifier)
     }
 
     func removeHostValue(for keys: Attribute<PreferenceKeys>, isInvalidating: Bool) {
@@ -112,7 +120,7 @@ package final class PreferenceBridge {
             hasRemoved = true
         }
         if hasRemoved {
-            viewGraph.graphInvalidation(from: isInvalidating ? nil : keys.identifier)
+            viewGraph?.graphInvalidation(from: isInvalidating ? nil : keys.identifier)
         }
     }
 

Sources/OpenSwiftUICore/Data/Preference/View_Preference.swift

@@ -22,17 +22,3 @@ extension View {
         modifier(_PreferenceTransformModifier<K>(transform: callback))
     }
 }
-
-extension EnvironmentValues {
-    private struct PreferenceBridgeKey: EnvironmentKey {
-        struct Value {
-            weak var value: PreferenceBridge?
-        }
-        static let defaultValue: Value = Value()
-    }
-
-    var preferenceBridge: PreferenceBridge? {
-        get { self[PreferenceBridgeKey.self].value }
-        set { self[PreferenceBridgeKey.self] = PreferenceBridgeKey.Value(value: newValue) }
-    }
-}

Sources/OpenSwiftUICore/EventHandling/InputEvent/HitTesting/ContentShapeKinds.swift

@@ -2,7 +2,7 @@
 //  ContentShapeKinds.swift
 //  OpenSwiftUI
 //
-//  Audited for RELEASE_2023
+//  Audited for RELEASE_2024
 //  Status: Complete
 
 import Foundation
@@ -55,7 +55,6 @@ public struct ContentShapeKinds: OptionSet, Sendable {
     /// When using this kind, only the preview shape will be affected. To
     /// control the shape used to hit-test and start the context menu
     /// presentation, use the `.interaction` kind.
-    @available(tvOS 17.0, *)
     @available(macOS, unavailable)
     @available(watchOS, unavailable)
     public static let contextMenuPreview: ContentShapeKinds = ContentShapeKinds(rawValue: 1 << 2)
@@ -69,10 +68,8 @@ public struct ContentShapeKinds: OptionSet, Sendable {
     /// This kind does not affect the `onHover` modifier.
     @available(macOS, unavailable)
     @available(watchOS, unavailable)
-    @available(tvOS, unavailable)
     public static let hoverEffect: ContentShapeKinds = ContentShapeKinds(rawValue: 1 << 3)
 
-    #if OPENSWIFTUI_SUPPORT_2023_API
     /// The kind for accessibility visuals and sorting.
     ///
     /// Setting a content shape with this kind causes the accessibility frame
@@ -85,5 +82,4 @@ public struct ContentShapeKinds: OptionSet, Sendable {
     ///
     /// To control the shape for accessibility and hit-testing, use the `interaction` kind.
     public static let accessibility: ContentShapeKinds = ContentShapeKinds(rawValue: 1 << 4)
-    #endif
 }

Sources/OpenSwiftUICore/Render/DisplayList.GraphicsRenderer.swift

@@ -0,0 +1,72 @@
+//
+//  DisplayList.GraphicsRenderer.swift
+//  OpenSwiftUICore
+//
+//  Audited for RELEASE_2024
+//  Status: Blocked by RenderBox and GraphicsContext
+//  ID: EFAEDE41CB8C85EF3A6A18DC05438A3C
+
+import Foundation
+
+extension DisplayList {
+    final package class GraphicsRenderer {
+        package enum PlatformViewMode {
+            case ignored
+            case unsupported
+            case rendered(update: Bool)
+        }
+        
+        private struct Cache {
+            var callbacks: [CallbackKey: Void /* RBDisplayListContents */]
+            var animators: [AnimatorKey: Void /* _DisplayList_AnyEffectAnimator */ ]
+            
+            struct CallbackKey: Hashable {
+                var index: DisplayList.Index.ID
+                var seed: DisplayList.Seed
+                var scale: CGFloat
+            }
+            
+            struct AnimatorKey: Hashable {
+                var index: DisplayList.Index.ID
+            }
+        }
+        
+        private var oldCache: DisplayList.GraphicsRenderer.Cache
+        private var newCache: DisplayList.GraphicsRenderer.Cache
+        var index: DisplayList.Index
+        var time: Time
+        var nextTime: Time
+        var stableIDs: _DisplayList_StableIdentityMap?
+        var inTransitionGroup: Bool
+        var stateHashes: [StrongHash]
+        package var platformViewMode: DisplayList.GraphicsRenderer.PlatformViewMode
+        
+        package init(platformViewMode: DisplayList.GraphicsRenderer.PlatformViewMode) {
+            fatalError("TODO")
+        }
+        
+        package func render(at time: Time, do body: () -> Void) {
+            fatalError("TODO")
+        }
+        
+        package func renderDisplayList(_ list: DisplayList, at time: Time, in ctx: inout GraphicsContext) {
+            fatalError("TODO")
+        }
+        
+        package func render(list: DisplayList, in ctx: inout GraphicsContext) {
+            fatalError("TODO")
+        }
+        
+        package func render(item: DisplayList.Item, in ctx: inout GraphicsContext) {
+            fatalError("TODO")
+        }
+        
+        package func drawImplicitLayer(in ctx: inout GraphicsContext, content: (inout GraphicsContext) -> Void) {
+            fatalError("TODO")
+        }
+        
+        package func renderPlatformView(_ view: AnyObject?, in ctx: GraphicsContext, size: CGSize, viewType: any Any.Type) {
+            fatalError("TODO")
+        }
+    }
+}