Update LeafDisplayList

Author: Kyle-Ye

Example/HostingExample/ViewController.swift

@@ -66,6 +66,6 @@ class ViewController: NSViewController {
 
 struct ContentView: View {
     var body: some View {
-        AppearanceActionModifierExample()
+        Color(uiColor: .red)
     }
 }

Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift

@@ -511,6 +511,9 @@ extension _UIHostingView: ViewRendererHost {
     }
 
     package func renderDisplayList(_ list: DisplayList, asynchronously: Bool, time: Time, nextTime: Time, targetTimestamp: Time?, version: DisplayList.Version, maxVersion: DisplayList.Version) -> Time {
+        #if DEBUG
+        print(list.description)
+        #endif
         // preconditionFailure("TODO")
         return .infinity
     }

Sources/OpenSwiftUICore/Graphic/BackdropEffect.swift

@@ -0,0 +1,20 @@
+//
+//  BackdropEffect.swift
+//  OpenSwiftUICore
+//
+//  Audited for iOS 18.0
+//  Status: WIP
+
+package struct BackdropEffect {
+    package var scale: Float
+
+    package var color: Color.Resolved
+
+    package var filters: [GraphicsFilter]
+
+    package init(scale: Float = 1, color: Color.Resolved = .black, filters: [GraphicsFilter] = [], captureOnly: Bool = false) {
+        self.scale = scale
+        self.color = color
+        self.filters = filters
+    }
+}

Sources/OpenSwiftUICore/Graphic/Color/ColorView.swift

@@ -31,7 +31,7 @@ package struct ColorView: RendererLeafView, Animatable {
     }
 
     package func content() -> DisplayList.Content.Value {
-        preconditionFailure("TODO")
+        .color(color)
     }
 
     package var animatableData: Color.Resolved.AnimatableData {

Sources/OpenSwiftUICore/Render/DisplayList/DisplayList.swift

@@ -4,7 +4,7 @@
 //
 //  Audited for iOS 18.0
 //  Status: WIP
-//  ID: F37E3733E490AA5E3BDC045E3D34D9F8
+//  ID: F37E3733E490AA5E3BDC045E3D34D9F8 (SwiftUICore)
 
 package import Foundation
 
@@ -105,22 +105,31 @@ extension DisplayList.Version: Sendable {}
 
 extension DisplayList {
     package typealias Identity = _DisplayList_Identity
+
     package typealias StableIdentity = _DisplayList_StableIdentity
+
     package typealias StableIdentityMap = _DisplayList_StableIdentityMap
+
     package typealias StableIdentityRoot = _DisplayList_StableIdentityRoot
+
     package typealias StableIdentityScope = _DisplayList_StableIdentityScope
-    
+
     package struct Item: Equatable {
         package var frame: CGRect
+
         package var version: Version
+
         package var value: Item.Value
+
         package var identity: Identity
+
         package enum Value {
             case empty
             case content(Content)
             case effect(Effect, DisplayList)
             case states([(StrongHash, DisplayList)])
         }
+
         package init(_ value: Item.Value, frame: CGRect, identity: Identity, version: Version) {
             self.frame = frame
             self.version = version
@@ -133,16 +142,19 @@ extension DisplayList {
         }
 
         package var position: CGPoint { frame.origin }
+
         package var size: CGSize { frame.size }
     }
 
     package struct Content {
         package var value: Content.Value
+
         package var seed: Seed
+
         package enum Value {
-//        indirect case backdrop(BackdropEffect)
+            indirect case backdrop(BackdropEffect)
             indirect case color(Color.Resolved)
-//        indirect case chameleonColor(fallback: Color.Resolved, filters: [GraphicsFilter])
+            indirect case chameleonColor(fallback: Color.Resolved, filters: [GraphicsFilter])
 //        indirect case image(GraphicsImage)
 //        indirect case shape(Path, AnyResolvedPaint, FillStyle)
 //        indirect case shadow(Path, ResolvedShadowStyle)
@@ -246,8 +258,14 @@ extension DisplayList {
             self.value = value
         }
 
-        package init() { self.init(value: .zero) }
-        package init(decodedValue value: UInt16) { self.init(value: value) }
+        package init() {
+            self.init(value: .zero)
+        }
+
+        package init(decodedValue value: UInt16) {
+            self.init(value: value)
+        }
+
         package init(_ version: Version) {
             if version.value == .zero {
                 self.init(value: .zero)
@@ -267,6 +285,7 @@ extension DisplayList {
 
         package static let undefined: Seed = Seed(value: 2)
     }
+    
     package struct Properties: OptionSet {
         package let rawValue: UInt8
         package init(rawValue: UInt8) {
@@ -404,3 +423,18 @@ extension DisplayList {
         }
     }
 }
+
+// MARK: - DisplayList.Item + Extension
+
+extension DisplayList.Item {
+    package mutating func canonicalize(options: DisplayList.Options = .init()) {
+        // TODO
+    }
+
+    // package func matchesTopLevelStructure(of other: DisplayList.Item) -> Bool
+
+    package var features: DisplayList.Features {
+        // TODO
+        []
+    }
+}

Sources/OpenSwiftUICore/Render/DisplayList/DisplayList+String.swift renamed to Sources/OpenSwiftUICore/Render/DisplayList/DisplayListPrinter.swift

@@ -1,14 +1,14 @@
 //
-//  DisplayList+String.swift
+//  DisplayListPrinter.swift
 //  OpenSwiftUICore
 //
 //  Audited for iOS 18.0
 //  Status: WIP
-//  ID: 11125C146A81D1913BFBD53B89D010C6
+//  ID: 11125C146A81D1913BFBD53B89D010C6 (SwiftUICore)
 
 extension DisplayList.Item {
     // TODO
-    var features: DisplayList.Features { [] }
+    // var features: DisplayList.Features { [] }
     var properties: DisplayList.Properties { [] }
 
     fileprivate func print(into printer: inout SExpPrinter) {

Sources/OpenSwiftUICore/Render/DisplayList/DisplayListTransforms.swift

@@ -0,0 +1,19 @@
+//
+//  DisplayListTransforms.swift
+//  OpenSwiftUICore
+//
+//  Audited for iOS 18.0
+//  Status: WIP
+//  ID: 8C82E31DBCFF23E23B8937F47207F4D1 (SwiftUICore)
+
+package import OpenGraphShims
+
+extension DisplayList {
+//    package mutating func insertLayerFilters(matrices: [_ForegroundLayerLevel : _ColorMatrix], version: DisplayList.Version, premultiplied: Bool) {
+//
+//    }
+
+    package mutating func applyViewGraphTransform(time: Attribute<Time>, version: DisplayList.Version) {
+        // TODO
+    }
+}

Sources/OpenSwiftUICore/Render/RendererLeafView.swift

@@ -3,21 +3,21 @@
 //  OpenSwiftUICore
 //
 //  Audited for iOS 18.0
-//  ID: 65609C35608651F66D749EB1BD9D2226 (SwiftUICore?)
+//  ID: 65609C35608651F66D749EB1BD9D2226 (SwiftUICore)
 //  Status: WIP
 
 package import Foundation
 import OpenGraphShims
 
 // MARK: - RendererLeafView [TODO]
 
-package protocol RendererLeafView: /*ContentResponder,*/ PrimitiveView, UnaryView {
+package protocol RendererLeafView: ContentResponder, PrimitiveView, UnaryView {
     static var requiresMainThread: Bool { get }
     func content() -> DisplayList.Content.Value
 }
 
 extension RendererLeafView {
-    package static var requiresMainThread: Swift.Bool {
+    package static var requiresMainThread: Bool {
         false
     }
 
@@ -26,8 +26,21 @@ extension RendererLeafView {
     }
 
     package static func makeLeafView(view: _GraphValue<Self>, inputs: _ViewInputs) -> _ViewOutputs {
-        // preconditionFailure("TODO")
-        _ViewOutputs()
+        // TODO
+        var outputs = _ViewOutputs()
+        // FIXME
+        outputs.preferences[DisplayList.Key.self] = Attribute(
+            LeafDisplayList(
+                identity: .init(),
+                view: view.value,
+                position: inputs.position,
+                size: inputs.size.cgSize,
+                containerPosition: inputs.containerPosition,
+                options: .defaultValue,
+                contentSeed: .init()
+            )
+        )
+        return outputs
     }
 }
 
@@ -90,3 +103,44 @@ package struct LeafLayoutEngine<V>: LayoutEngine where V: LeafViewLayout {
         }
     }
 }
+
+// MARK: - LeafDisplayList [WIP]
+
+private struct LeafDisplayList<V>: StatefulRule, CustomStringConvertible where V: RendererLeafView {
+    let identity: DisplayList.Identity
+    @Attribute var view: V
+    @Attribute var position: ViewOrigin
+    @Attribute var size: CGSize
+    @Attribute var containerPosition: ViewOrigin
+    let options: DisplayList.Options
+    var contentSeed: DisplayList.Seed
+
+    typealias Value = DisplayList
+
+    static var flags: OGAttributeTypeFlags {
+        V.requiresMainThread ? .mainThread : []
+    }
+
+    mutating func updateValue() {
+        let (view, changed) = $view.changedValue()
+        let content = view.content()
+        let version = DisplayList.Version(forUpdate: ())
+        if changed {
+            contentSeed = .init(version)
+        }
+        var item = DisplayList.Item(
+            .content(DisplayList.Content(content, seed: contentSeed)),
+            frame: CGRect(
+                origin: CGPoint(position.value - containerPosition.value),
+                size: size
+            ),
+            identity: identity,
+            version: version
+        )
+        item.canonicalize(options: options)
+        // TODO
+        value = DisplayList(item)
+    }
+
+    var description: String { "LeafDisplayList" }
+}

Sources/OpenSwiftUICore/View/Graph/ViewGraph.swift

@@ -34,7 +34,7 @@ package final class ViewGraph: GraphHost {
         @inline(__always)
         fileprivate func addRequestedPreferences(to inputs: inout _ViewInputs) {
             inputs.preferences.add(HostPreferencesKey.self)
-            if contains(.platformItemList) {
+            if contains(.displayList) {
                 inputs.preferences.add(DisplayList.Key.self)
             }
             if contains(.viewResponders) {
@@ -511,7 +511,10 @@ private struct RootDisplayList: Rule, AsyncAttribute {
     @Attribute var time: Time
 
     var value: (DisplayList, DisplayList.Version) {
-        preconditionFailure("TODO")
+        var displayList = content
+        let version = DisplayList.Version(forUpdate: ())
+        displayList.applyViewGraphTransform(time: $time, version: version)
+        return (content, version)
     }
 }
 
@@ -579,7 +582,8 @@ package struct RootGeometry: Rule, AsyncAttribute {
     // |                                                                              |  y: i.t+(p.height-f.height)*0.5=14
     // └──────────────────────────────────────────────────────────────────────────────┘
     package var value: ViewGeometry {
-        preconditionFailure("TODO")
+        .init(origin: .zero, dimensions: .zero)
+//        preconditionFailure("TODO")
 //        let layoutComputer = childLayoutComputer ?? .defaultValue
 //        let insets = safeAreaInsets?.insets ?? EdgeInsets()
 //        let proposal = proposedSize.value.inset(by: insets)