Update ViewGraph init (#175)

* Add RenderUtil.c * Update ViewGraph init method * Update PreferenceBridge * Update ViewGraph init and deint lifecycle * Add RootDisplayList * Fix Linux build warning * Update codecov file
OpenSwiftUIProject · Dec 15, 2024 · fb084bb · fb084bb
1 parent 23542c4
commit fb084bb
Show file tree

Hide file tree

Showing 13 changed files with 512 additions and 261 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -6,9 +6,9 @@ coverage:
       default:
         target: auto 
         threshold: 5
-    patch:
-      default:
-        target: auto 
-        threshold: 5
+    patch: off
+      # default:
+      #   target: auto 
+      #   threshold: 5
 ignore:
   - Tests
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "3ec5ceae50a3ce95edc97ef8b27b3a65cb61320642aa5cc535bb5d4690cb4230",
+  "originHash" : "1cf308da26a892a1962d7acfd0aeae3c95ac506674d47f80a07474eb8476d770",
   "pins" : [
     {
       "identity" : "darwinprivateframeworks",

diff --git a/Package.swift b/Package.swift
@@ -314,15 +314,23 @@ if useLocalDeps {
     package.dependencies += [
         .package(path: "../OpenGraph"),
         .package(path: "../OpenBox"),
-        .package(path: "../DarwinPrivateFrameworks"),
     ]
+    if attributeGraphCondition || renderBoxCondition {
+        package.dependencies.append(
+            .package(path: "../DarwinPrivateFrameworks")
+        )
+    }
 } else {
     package.dependencies += [
         // FIXME: on Linux platform: OG contains unsafe build flags which prevents us using version dependency
         .package(url: "https://github.com/OpenSwiftUIProject/OpenGraph", branch: "main"),
         .package(url: "https://github.com/OpenSwiftUIProject/OpenBox", branch: "main"),
-        .package(url: "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", branch: "main"),
     ]
+    if attributeGraphCondition || renderBoxCondition {
+        package.dependencies.append(
+            .package(url: "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git", branch: "main")
+        )
+    }
 }
 
 #if os(macOS)

diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift b/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift
@@ -3,7 +3,7 @@
 //  OpenSwiftUICore
 //
 //  Audited for iOS 18.0
-//  Status: Blocked by ViewGraph
+//  Status: Complete
 //  ID: A9FAE381E99529D5274BA37A9BC9B074 (SwiftUI)
 //  ID: DF57A19C61B44C613EB77C1D47FC679A (SwiftUICore)
 
@@ -31,12 +31,12 @@ package final class PreferenceBridge {
     package func invalidate() {
         requestedPreferences = PreferenceKeys()
         bridgedViewInputs = PropertyList()
-        // TODO: Blocked by ViewGraph
-        // for child in children {
-            // let viewGraph = child.takeRetainedValue()
-            // viewGraph.setPreferenceBridge(to: nil, isInvalidating: true)
-            // child.release()
-        // }
+        for child in children {
+            let viewGraph = child.takeRetainedValue()
+            viewGraph.invalidatePreferenceBridge()
+            child.release()
+        }
+        viewGraph = nil
         isValid = false
     }
 
@@ -109,10 +109,11 @@ package final class PreferenceBridge {
     }
 
     package func removedStateDidChange() {
-        // TODO: Blocked by ViewGraph
-        // for child in children {
-            // let viewGraph = child.takeUnretainedValue()
-        // }
+        for child in children {
+            let viewGraph = child.takeUnretainedValue()
+            viewGraph.updateRemovedState()
+            child.release()
+        }
     }
 
     #if canImport(Darwin)

diff --git a/Sources/OpenSwiftUICore/Graph/GraphHost.swift b/Sources/OpenSwiftUICore/Graph/GraphHost.swift
@@ -4,8 +4,8 @@
 //
 //  Audited for iOS 18.0
 //  Status: Blocked by transactions
-//  ID: 30C09FF16BC95EC5173809B57186CAC3 (RELEASE_2021)
-//  ID: F9F204BD2F8DB167A76F17F3FB1B3335 (RELEASE_2024)
+//  ID: 30C09FF16BC95EC5173809B57186CAC3 (SwiftUI)
+//  ID: F9F204BD2F8DB167A76F17F3FB1B3335 (SwiftUICore)
 
 import OpenSwiftUI_SPI
 package import OpenGraphShims
@@ -329,7 +329,38 @@ extension GraphHost {
     }
 
     package final func updateRemovedState() {
-        preconditionFailure("TODO")
+        let isRemoved: Bool
+        let removedState: RemovedState
+
+        if self.removedState.isEmpty {
+            if let parentHost {
+                let state = parentHost.removedState
+                isRemoved = state.contains(.unattached)
+                removedState = state
+            } else {
+                isRemoved = false
+                removedState = []
+            }
+        } else {
+            isRemoved = true
+            removedState = self.removedState
+        }
+        let isHiddenForReuse = removedState.contains(.hiddenForReuse)
+
+        if isRemoved != data.isRemoved {
+            if isRemoved {
+                rootSubgraph.willRemove()
+                // TODO: OGSubgraphRemoveChild
+            } else {
+                // TODO: OGSubgraphAddChild
+                rootSubgraph.didReinsert()
+            }
+            data.isRemoved = isRemoved
+        }
+        if isHiddenForReuse != data.isHiddenForReuse {
+            data.isHiddenForReuse = isHiddenForReuse
+            isHiddenForReuseDidChange()
+        }
     }
 
     // MARK: - GraphHost + Transaction
@@ -582,7 +613,7 @@ private final class GlobalTransaction {
     }
 }
 
-// MARK: - Graph + Extension
+// MARK: - Graph + GraphHost
 
 extension Graph {
     package func graphHost() -> GraphHost {

diff --git a/Sources/OpenSwiftUICore/Layout/Edge/EdgeInsets.swift b/Sources/OpenSwiftUICore/Layout/Edge/EdgeInsets.swift
@@ -16,7 +16,6 @@ public struct EdgeInsets: Equatable {
     public var trailing: CGFloat
 
     @inlinable
-    @inline(__always)
     public init(top: CGFloat, leading: CGFloat, bottom: CGFloat, trailing: CGFloat) {
         self.top = top
         self.leading = leading
@@ -25,11 +24,12 @@ public struct EdgeInsets: Equatable {
     }
 
     @inlinable
-    @inline(__always)
     public init() {
         self.init(top: 0, leading: 0, bottom: 0, trailing: 0)
     }
 
+    package static var zero: EdgeInsets { EdgeInsets() }
+
     @inline(__always)
     init(_ value: CGFloat, edges: Edge.Set) {
         self.init(

diff --git a/Sources/OpenSwiftUICore/View/Debug/ViewDebug.swift b/Sources/OpenSwiftUICore/View/Debug/ViewDebug.swift
@@ -97,7 +97,15 @@ extension View {
     }
 }
 
-extension ViewModifier {
+extension ViewModifier {    
+    package static func makeDebuggableView(
+        modifier: _GraphValue<Self>,
+        inputs: _ViewInputs,
+        body: @escaping (_Graph, _ViewInputs) -> _ViewOutputs
+    ) -> _ViewOutputs {
+        preconditionFailure("TODO")
+    }
+
     static func makeDebuggableViewList(
         modifier: _GraphValue<Self>,
         inputs: _ViewListInputs,