Update AnyView and ViewDebug.makeView

Kyle-Ye · Kyle-Ye · commit d8c582437c68 · 2024-04-06T00:15:11.000+08:00
diff --git a/Sources/OpenSwiftUI/Core/Graph/GraphInputs.swift b/Sources/OpenSwiftUI/Core/Graph/GraphInputs.swift
@@ -6,7 +6,7 @@ public struct _GraphInputs {
     var cachedEnvironment: MutableBox<CachedEnvironment>
     var phase: Attribute<_GraphInputs.Phase>
     var transaction: Attribute<Transaction>
-    var changedDebugProperties: _ViewDebug.Properties
+    private var changedDebugProperties: _ViewDebug.Properties
     private var options: _GraphInputs.Options
     #if canImport(Darwin) // FIXME: See #39
     var mergedInputs: Set<OGAttribute>
@@ -55,14 +55,31 @@ public struct _GraphInputs {
         set { customInputs[type] = newValue }
     }
     
+    // MARK: - cachedEnvironment
+    
     @inline(__always)
     func detechedEnvironmentInputs() -> Self {
         var newInputs = self
         newInputs.cachedEnvironment = MutableBox(cachedEnvironment.wrappedValue)
         return newInputs
     }
     
-    // MARK: Options
+    @inline(__always)
+    mutating func updateCachedEnvironment(_ box: MutableBox<CachedEnvironment>) {
+        cachedEnvironment = box
+        changedDebugProperties.insert(.environment)
+    }
+    
+    // MARK: - changedDebugProperties
+    
+    @inline(__always)
+    func withEmptyChangedDebugPropertiesInputs<R>(_ body: (_GraphInputs) -> R) -> R {
+        var inputs = self
+        inputs.changedDebugProperties = []
+        return body(inputs)
+    }
+    
+    // MARK: - options
     
     @inline(__always)
     var enableLayout: Bool {
diff --git a/Sources/OpenSwiftUI/Core/View/CustomView.swift b/Sources/OpenSwiftUI/Core/View/CustomView.swift
@@ -10,15 +10,16 @@ internal import OpenGraphShims
 
 extension View {
     static func makeView(view: _GraphValue<Self>, inputs: _ViewInputs) -> _ViewOutputs {
-        var inputs = inputs
-        inputs.base.changedDebugProperties = []
         let fields = DynamicPropertyCache.fields(of: Self.self)
-        let (body, buffer) = makeBody(view: view, inputs: &inputs.base, fields: fields)
-        OGSubgraph.beginTreeElement(value: body.value, flags: 0)
-        var outputs = Body._makeView(view: body, inputs: inputs)
-        if OGSubgraph.shouldRecordTree {
-            _ViewDebug.reallyWrap(&outputs, value: body, inputs: &inputs) // FIXME
-            OGSubgraph.endTreeElement(value: body.value)
+        var inputs = inputs
+        let (body, buffer) = inputs.withMutateGraphInputs { inputs in
+            makeBody(view: view, inputs: &inputs, fields: fields)
+        }
+        let outputs = _ViewDebug.makeView(
+            view: body,
+            inputs: inputs
+        ) { view, inputs in
+            Body._makeView(view: body, inputs: inputs)
         }
         if let buffer {
             buffer.traceMountedProperties(to: body, fields: fields)
diff --git a/Sources/OpenSwiftUI/Core/View/ViewGraph.swift b/Sources/OpenSwiftUI/Core/View/ViewGraph.swift
@@ -215,8 +215,9 @@ final class ViewGraph: GraphHost {
                 as: RootGeometry.self,
                 invalidating: true
             ) { rootGeometry in
-                // FIXME
-                rootGeometry.$layoutDirection = inputs.base.cachedEnvironment.wrappedValue.attribute(keyPath: \.layoutDirection)
+                inputs.withMutableCachedEnviroment {
+                    rootGeometry.$layoutDirection = $0.attribute(keyPath: \.layoutDirection)
+                }
             }
             // TOOD
             return makeRootView(rootView, inputs)
diff --git a/Sources/OpenSwiftUI/Core/View/ViewInputs.swift b/Sources/OpenSwiftUI/Core/View/ViewInputs.swift
@@ -1,19 +1,30 @@
 internal import OpenGraphShims
 
 public struct _ViewInputs {
-    var base: _GraphInputs
+    private var base: _GraphInputs
     var preferences: PreferencesInputs
     var transform: Attribute<ViewTransform>
     var position: Attribute<ViewOrigin>
     var containerPosition: Attribute<ViewOrigin>
     var size: Attribute<ViewSize>
     var safeAreaInsets: OptionalAttribute<SafeAreaInsets>
     
-    @inline(__always)
-    func detechedEnvironmentInputs() -> Self {
-        var newInputs = self
-        newInputs.base = self.base.detechedEnvironmentInputs()
-        return newInputs
+    init(
+        base: _GraphInputs,
+        preferences: PreferencesInputs,
+        transform: Attribute<ViewTransform>,
+        position: Attribute<ViewOrigin>,
+        containerPosition: Attribute<ViewOrigin>,
+        size: Attribute<ViewSize>,
+        safeAreaInsets: OptionalAttribute<SafeAreaInsets>
+    ) {
+        self.base = base
+        self.preferences = preferences
+        self.transform = transform
+        self.position = position
+        self.containerPosition = containerPosition
+        self.size = size
+        self.safeAreaInsets = safeAreaInsets
     }
     
     func makeIndirectOutputs() -> _ViewOutputs {
@@ -36,7 +47,56 @@ public struct _ViewInputs {
         }
         return outputs
     }
-        
+    
+    // MARK: - base
+    
+    @inline(__always)
+    mutating func withMutateGraphInputs<R>(_ body: (inout _GraphInputs) -> R) -> R {
+        body(&base)
+    }
+    
+    // MARK: - base.customInputs
+    
+    @inline(__always)
+    func withCustomInputs<R>(_ body: (PropertyList) -> R) -> R {
+        body(base.customInputs)
+    }
+    
+    @inline(__always)
+    mutating func withMutableCustomInputs<R>(_ body: (inout PropertyList) -> R) -> R {
+        body(&base.customInputs)
+    }
+    
+    // MARK: - base.cachedEnvironment
+    
+    @inline(__always)
+    func withCachedEnviroment<R>(_ body: (CachedEnvironment) -> R) -> R {
+        body(base.cachedEnvironment.wrappedValue)
+    }
+    
+    @inline(__always)
+    func withMutableCachedEnviroment<R>(_ body: (inout CachedEnvironment) -> R) -> R {
+        body(&base.cachedEnvironment.wrappedValue)
+    }
+    
+    @inline(__always)
+    func detechedEnvironmentInputs() -> Self {
+        var newInputs = self
+        newInputs.base = self.base.detechedEnvironmentInputs()
+        return newInputs
+    }
+    
+    // MARK: - base.changedDebugProperties
+    
+    @inline(__always)
+    func withEmptyChangedDebugPropertiesInputs<R>(_ body: (_ViewInputs) -> R) -> R {
+        var newInputs = self
+        return base.withEmptyChangedDebugPropertiesInputs {
+            newInputs.base = $0
+            return body(newInputs)
+        }
+    }
+    
     // MARK: Options
         
     @inline(__always)
diff --git a/Sources/OpenSwiftUI/Data/Environment/EnvironmentKeyTransformModifier.swift b/Sources/OpenSwiftUI/Data/Environment/EnvironmentKeyTransformModifier.swift
@@ -27,8 +27,7 @@ public struct _EnvironmentKeyTransformModifier<Value>: PrimitiveViewModifier, _G
         )
         let attribute = Attribute(childEnvironment)
         let cachedEnvironment = CachedEnvironment(attribute)  
-        inputs.cachedEnvironment = MutableBox(cachedEnvironment)
-        inputs.changedDebugProperties.insert(.environment)
+        inputs.updateCachedEnvironment(MutableBox(cachedEnvironment))
     }
 }
 
diff --git a/Sources/OpenSwiftUI/Data/Preference/PreferenceBridge.swift b/Sources/OpenSwiftUI/Data/Preference/PreferenceBridge.swift
@@ -152,7 +152,7 @@ final class PreferenceBridge {
     }
 
     func wrapInputs(_ inputs: inout _ViewInputs) {
-        inputs.base.customInputs = bridgedViewInputs
+        inputs.withMutableCustomInputs { $0 = bridgedViewInputs }
         inputs.preferences.merge(requestedPreferences)
         inputs.preferences.hostKeys = Attribute(MergePreferenceKeys(lhs: inputs.preferences.hostKeys, rhs: _hostPreferenceKeys))
     }
@@ -165,7 +165,7 @@ final class PreferenceBridge {
                 result = Attribute(PreferenceCombiner<Key>(attributes: [])).identifier
             }
         }
-        bridgedViewInputs = inputs.base.customInputs
+        inputs.withCustomInputs { bridgedViewInputs = $0 }
         for key in inputs.preferences.keys {
             if key == _AnyPreferenceKey<HostPreferencesKey>.self {
                 let combiner = Attribute(HostPreferencesCombiner(
diff --git a/Sources/OpenSwiftUI/View/Debug/TODO/ViewDebug.swift b/Sources/OpenSwiftUI/View/Debug/TODO/ViewDebug.swift
@@ -41,9 +41,31 @@ extension _ViewDebug {
             OGSubgraph.setShouldRecordTree()
         }
     }
-        
-    // TODO:
-    /*private*/ static func reallyWrap<Value>(_: inout _ViewOutputs, value: _GraphValue<Value>, inputs _: UnsafePointer<_ViewInputs>) {}
+    
+    @_transparent
+    @inline(__always)
+    static func makeView<Value>(
+        view: _GraphValue<Value>,
+        inputs: _ViewInputs,
+        body: (_ view: _GraphValue<Value>, _ inputs: _ViewInputs) -> _ViewOutputs
+    ) -> _ViewOutputs {
+        var inputs = inputs
+        if OGSubgraph.shouldRecordTree {
+            OGSubgraph.beginTreeElement(value: view.value, flags: 0)
+        }
+        var outputs = inputs.withEmptyChangedDebugPropertiesInputs { inputs in
+            body(view, inputs)
+        }
+        if OGSubgraph.shouldRecordTree {
+            _ViewDebug.reallyWrap(&outputs, value: view, inputs: &inputs)
+            OGSubgraph.endTreeElement(value: view.value)
+        }
+        return outputs
+    }
+    
+    private static func reallyWrap<Value>(_: inout _ViewOutputs, value: _GraphValue<Value>, inputs _: UnsafePointer<_ViewInputs>) {
+        // TODO
+    }
 
     fileprivate static func appendDebugData(from: Int/*AGTreeElement*/ , to: [_ViewDebug.Data]) {}
 }
diff --git a/Sources/OpenSwiftUI/View/View/AnyView.swift b/Sources/OpenSwiftUI/View/View/AnyView.swift
@@ -70,7 +70,7 @@ class AnyViewStorageBase {
     fileprivate var canTransition: Bool { fatalError() }
     fileprivate func matches(_ other: AnyViewStorageBase) -> Bool { fatalError() }
     fileprivate func makeChild(
-        uniqueID: UInt32,
+        uniqueId: UInt32,
         container: Attribute<AnyViewInfo>,
         inputs: _ViewInputs
     ) -> _ViewOutputs {
@@ -104,6 +104,21 @@ private final class AnyViewStorage<V: View>: AnyViewStorageBase {
         other is AnyViewStorage<V>
     }
     
+    override func makeChild(
+        uniqueId: UInt32,
+        container: Attribute<AnyViewInfo>,
+        inputs: _ViewInputs
+    ) -> _ViewOutputs {
+        let child = AnyViewChild<V>(info: container, uniqueId: uniqueId)
+        let graphValue = _GraphValue(Attribute(child))
+        return _ViewDebug.makeView(
+            view: graphValue,
+            inputs: inputs
+        ) { view, inputs in
+            V._makeView(view: view, inputs: inputs)
+        }
+    }
+    
     override func child<Value>() -> Value { view as! Value }
     
     // TODO
@@ -155,7 +170,11 @@ private struct AnyViewContainer: StatefulRule, AsyncAttribute {
         parentSubgraph.addChild(childGraph)
         return childGraph.apply {
             let childInputs = inputs.detechedEnvironmentInputs()
-            let childOutputs = storage.makeChild(uniqueID: uniqueId, container: current.unsafeCast(to: AnyViewInfo.self), inputs: childInputs)
+            let childOutputs = storage.makeChild(
+                uniqueId: uniqueId,
+                container: current.unsafeCast(to: AnyViewInfo.self),
+                inputs: childInputs
+            )
             outputs.attachIndirectOutputs(to: childOutputs)
             return AnyViewInfo(item: storage, subgraph: childGraph, uniqueID: uniqueId)
         }
@@ -168,3 +187,27 @@ private struct AnyViewContainer: StatefulRule, AsyncAttribute {
         subgraph.invalidate()
     }
 }
+
+private struct AnyViewChild<V: View>: StatefulRule, AsyncAttribute {
+    @Attribute var info: AnyViewInfo
+    let uniqueId: UInt32
+    
+    typealias Value = V
+    
+    func updateValue() {
+        guard uniqueId == info.uniqueID else {
+            return
+        }
+        value = info.item.child()
+    }
+}
+
+extension AnyViewChild: CustomStringConvertible {
+    var description: String { "\(V.self)" }
+}
+
+// TODO
+private struct AnyViewChildList<V: View> {
+    @Attribute var view: AnyView
+    var id: UniqueID?
+}

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ public struct _EnvironmentKeyTransformModifier<Value>: PrimitiveViewModifier, _G`
`27`	`27`	`)`
`28`	`28`	`let attribute = Attribute(childEnvironment)`
`29`	`29`	`let cachedEnvironment = CachedEnvironment(attribute)`
`30`		`- inputs.cachedEnvironment = MutableBox(cachedEnvironment)`
`31`		`- inputs.changedDebugProperties.insert(.environment)`
	`30`	`+ inputs.updateCachedEnvironment(MutableBox(cachedEnvironment))`
`32`	`31`	`}`
`33`	`32`	`}`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ final class PreferenceBridge {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`func wrapInputs(_ inputs: inout _ViewInputs) {`
`155`		`- inputs.base.customInputs = bridgedViewInputs`
	`155`	`+ inputs.withMutableCustomInputs { $0 = bridgedViewInputs }`
`156`	`156`	`inputs.preferences.merge(requestedPreferences)`
`157`	`157`	`inputs.preferences.hostKeys = Attribute(MergePreferenceKeys(lhs: inputs.preferences.hostKeys, rhs: _hostPreferenceKeys))`
`158`	`158`	`}`
`@@ -165,7 +165,7 @@ final class PreferenceBridge {`
`165`	`165`	`result = Attribute(PreferenceCombiner<Key>(attributes: [])).identifier`
`166`	`166`	`}`
`167`	`167`	`}`
`168`		`- bridgedViewInputs = inputs.base.customInputs`
	`168`	`+ inputs.withCustomInputs { bridgedViewInputs = $0 }`
`169`	`169`	`for key in inputs.preferences.keys {`
`170`	`170`	`if key == _AnyPreferenceKey<HostPreferencesKey>.self {`
`171`	`171`	`let combiner = Attribute(HostPreferencesCombiner(`