Update PreferenceBridge

OpenSwiftUIProject · Oct 20, 2024 · cc69107 · cc69107
1 parent a709674
commit cc69107
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/Sources/OpenSwiftUICore/Data/Preference/PreferenceBridge.swift b/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)
         }
     }
 

diff --git a/Sources/OpenSwiftUICore/View/Graph/ViewRendererHost.swift b/Sources/OpenSwiftUICore/View/Graph/ViewRendererHost.swift
@@ -103,9 +103,7 @@ extension ViewRendererHost {
         fatalError("TODO")
     }
 
-    package func didRender() {
-        fatalError("TODO")
-    }
+    package func didRender() {}
 
     @_spi(ForOpenSwiftUIOnly)
     public func preferencesDidChange() {
@@ -199,8 +197,8 @@ extension ViewRendererHost {
         fatalError("TODO")
     }
     package var centersRootView: Bool {
-        get { fatalError("TODO") }
-        set { fatalError("TODO") }
+        get { viewGraph.centersRootView }
+        set { viewGraph.centersRootView = newValue }
     }
 
 //    package var responderNode: ResponderNode? {
@@ -212,12 +210,12 @@ extension ViewRendererHost {
     }
     private var enclosingHosts: [ViewRendererHost] { fatalError("TODO") }
     package func performExternalUpdate(_ update: () -> Void) { fatalError("TODO") }
-    package func updateFocusedItem() { fatalError("TODO") }
-    package func updateFocusedValues() { fatalError("TODO") }
-    package func updateFocusStore() { fatalError("TODO") }
-    package func updateAccessibilityFocus() { fatalError("TODO") }
-    package func updateAccessibilityFocusStore() { fatalError("TODO") }
-    package func updateAccessibilityEnvironment() { fatalError("TODO") }
+    package func updateFocusedItem() {}
+    package func updateFocusedValues() {}
+    package func updateFocusStore() {}
+    package func updateAccessibilityFocus() {}
+    package func updateAccessibilityFocusStore() {}
+    package func updateAccessibilityEnvironment() {}
 }
 
 // MARK: - ViewRendererHost + Gesture [TODO]