Refactor

SeKi81 · Nov 20, 2024 · db0412a · db0412a
1 parent b3ff873
commit db0412a
Show file tree

Hide file tree

Showing 16 changed files with 133 additions and 41 deletions.
diff --git a/Sources/SwiftUIX/Intermodular/Helpers/AppKit/_AppKitOrUIKitHostingPopover.swift b/Sources/SwiftUIX/Intermodular/Helpers/AppKit/_AppKitOrUIKitHostingPopover.swift
@@ -361,7 +361,7 @@ open class NSHostingPopover<Content: View>: _AnyAppKitOrUIKitHostingPopover, NSP
         } else {
             let contentViewController = _contentViewController
 
-            self.objectWillChange.send()
+            self._objectWillChange_send()
 
             let content = contentViewController.mainView.content
 

diff --git a/Sources/SwiftUIX/Intermodular/Helpers/Combine/AnyObservableValue.swift b/Sources/SwiftUIX/Intermodular/Helpers/Combine/AnyObservableValue.swift
@@ -2,6 +2,7 @@
 // Copyright (c) Vatsal Manot
 //
 
+import _SwiftUIX
 import Combine
 import Swift
 import SwiftUI
@@ -10,6 +11,24 @@ import SwiftUI
 @dynamicMemberLookup
 @_documentation(visibility: internal)
 public class AnyObservableValue<Value>: _SwiftUIX_AnyIndirectValueBox, ObservableObject {
+    public struct Configuration {
+        public var deferUpdates: Bool
+
+        public init(
+            deferUpdates: Bool?
+        ) {
+            self.deferUpdates = deferUpdates ?? false
+        }
+
+        public init() {
+            self.init(
+                deferUpdates: nil
+            )
+        }
+    }
+
+    public var configuration = Configuration()
+
     public var wrappedValue: Value {
         get {
             fatalError() // abstract
@@ -18,10 +37,10 @@ public class AnyObservableValue<Value>: _SwiftUIX_AnyIndirectValueBox, Observabl
         }
     }
 
-    internal init() {
-
+    init(configuration: Configuration) {
+        self.configuration = configuration
     }
-    
+
     public subscript<Subject>(
         dynamicMember keyPath: WritableKeyPath<Value, Subject>
     ) -> AnyObservableValue<Subject> {
@@ -30,7 +49,7 @@ public class AnyObservableValue<Value>: _SwiftUIX_AnyIndirectValueBox, Observabl
 
     @_disfavoredOverload
     public subscript<Subject>(dynamicMember keyPath: WritableKeyPath<Value, Subject>) -> Binding<Subject> {
-        return .init(
+        return Binding<Subject>(
             get: { self.wrappedValue[keyPath: keyPath] },
             set: { self.wrappedValue[keyPath: keyPath] = $0 }
         )
@@ -51,16 +70,21 @@ enum ObservableValues {
             get {
                 root
             } set {
-                objectWillChange.send()
-                
+                _objectWillChange_send(deferred: configuration.deferUpdates)
+
                 root = newValue
 
                 _objectDidChange.send()
             }
         }
 
-        public init(root: Root) {
+        public init(
+            root: Root,
+            configuration: AnyObservableValue<Root>.Configuration = .init()
+        ) {
             self.root = root
+
+            super.init(configuration: configuration)
         }
     }
 
@@ -74,21 +98,29 @@ enum ObservableValues {
             get {
                 root.wrappedValue[keyPath: keyPath]
             } set {
-                objectWillChange.send()
-                
+                _objectWillChange_send(deferred: configuration.deferUpdates)
+
                 root.wrappedValue[keyPath: keyPath] = newValue
             }
         }
 
-        public init(root: AnyObservableValue<Root>, keyPath: WritableKeyPath<Root, Value>) {
+        public init(
+            root: AnyObservableValue<Root>,
+            keyPath: WritableKeyPath<Root, Value>,
+            configuration: AnyObservableValue<Value>.Configuration = .init()
+        ) {
             self.root = root
             self.keyPath = keyPath
             self.subscription = nil
 
-            super.init()
+            super.init(configuration: configuration)
 
-            subscription = root.objectWillChange.sink(receiveValue: { _ in
-                self.objectWillChange.send()
+            subscription = root.objectWillChange.sink(receiveValue: { [weak self] _ in
+                guard let `self` = self else {
+                    return
+                }
+
+                self._objectWillChange_send(deferred: self.configuration.deferUpdates)
             })
         }
     }
@@ -104,21 +136,29 @@ enum ObservableValues {
             get {
                 root[keyPath: keyPath]
             } set {
-                objectWillChange.send()
+                _objectWillChange_send(deferred: configuration.deferUpdates)
 
                 root[keyPath: keyPath] = newValue
             }
         }
 
-        public init(root: Root, keyPath: ReferenceWritableKeyPath<Root, Value>) {
+        public init(
+            root: Root,
+            keyPath: ReferenceWritableKeyPath<Root, Value>,
+            configuration: AnyObservableValue<Value>.Configuration = .init()
+        ) {
             self.root = root
             self.keyPath = keyPath
             self.subscription = nil
 
-            super.init()
+            super.init(configuration: configuration)
 
-            subscription = root.objectWillChange.sink(receiveValue: { _ in
-                self.objectWillChange.send()
+            subscription = root.objectWillChange.sink(receiveValue: { [weak self] _ in
+                guard let `self` = self else {
+                    return
+                }
+
+                self._objectWillChange_send(deferred: self.configuration.deferUpdates)
             })
         }
     }

diff --git a/Sources/SwiftUIX/Intermodular/Helpers/Combine/_ObservableObjectBox.swift b/Sources/SwiftUIX/Intermodular/Helpers/Combine/_ObservableObjectBox.swift
@@ -56,7 +56,7 @@ public final class _ObservableObjectMutableBox<Value, WrappedValue>: _AnyObserva
                 }
             }
 
-            objectWillChange.send()
+            _objectWillChange_send()
         } didSet {
             if _equate(oldValue, base), baseSubscription != nil {
                 return
@@ -279,7 +279,7 @@ public final class _ObservableObjectMutableBox<Value, WrappedValue>: _AnyObserva
                     return
                 }
 
-                `self`.objectWillChange.send()
+                `self`._objectWillChange_send()
             })
     }
 }

diff --git a/Sources/SwiftUIX/Intermodular/Helpers/Swift/ReferenceBox.swift b/Sources/SwiftUIX/Intermodular/Helpers/Swift/ReferenceBox.swift
@@ -2,6 +2,7 @@
 // Copyright (c) Vatsal Manot
 //
 
+import _SwiftUIX
 import Combine
 import Swift
 import SwiftUI
@@ -259,7 +260,7 @@ public final class _SwiftUIX_ObservableWeakReferenceBox<T: AnyObject>: Observabl
                 return
             }
 
-            objectWillChange.send()
+            _objectWillChange_send()
         }
     }
 
@@ -295,7 +296,7 @@ public final class _SwiftUIX_ObservableWeakReferenceBox<T: AnyObject>: Observabl
 public final class _SwiftUIX_WeakObservableReferenceBox<Value: AnyObject>: ObservableObject {
     public weak var value: Value? {
         didSet {
-            objectWillChange.send()
+            _objectWillChange_send()
         }
     }
 

diff --git a/Sources/SwiftUIX/Intermodular/Helpers/UIKit/UIHostingPageViewController.swift b/Sources/SwiftUIX/Intermodular/Helpers/UIKit/UIHostingPageViewController.swift
@@ -4,6 +4,7 @@
 
 #if (os(iOS) && canImport(CoreTelephony)) || os(tvOS) || targetEnvironment(macCatalyst)
 
+import _SwiftUIX
 import Swift
 import SwiftUI
 import UIKit
@@ -159,7 +160,7 @@ class UIHostingPageViewController<Page: View>: UIPageViewController, _opaque_UIH
         let activePageTransitionProgress = (scrollView.contentOffset.x - view.frame.size.width) / view.frame.size.width
 
         if paginationState != nil {
-            // _pageUpdateDriver.objectWillChange.send() // FIXME: This does not perform well.
+            // _pageUpdateDriver._objectWillChange_send() // FIXME: This does not perform well.
         }
 
         if activePageTransitionProgress == 0 {

diff --git a/Sources/SwiftUIX/Intramodular/Dynamic Properties/ObservedValue.swift b/Sources/SwiftUIX/Intramodular/Dynamic Properties/ObservedValue.swift
@@ -6,10 +6,20 @@ import Combine
 import Swift
 import SwiftUI
 
+public struct ObservedValueConfiguration<Value> {
+    public var deferUpdates: Bool = false
+
+    public init() {
+
+    }
+}
+
 @dynamicMemberLookup
 @propertyWrapper
 @_documentation(visibility: internal)
 public struct ObservedValue<Value>: DynamicProperty {
+    public var configuration = ObservedValueConfiguration<Value>()
+
     @PersistentObject var base: AnyObservableValue<Value>
 
     public var wrappedValue: Value {
@@ -21,11 +31,15 @@ public struct ObservedValue<Value>: DynamicProperty {
     }
 
     public var projectedValue: ObservedValue<Value> {
-        self
+        get {
+            self
+        } set {
+            self = newValue
+        }
     }
 
     public var binding: Binding<Value> {
-        .init(
+        Binding<Value>(
             get: { self.wrappedValue },
             set: { self.wrappedValue = $0 }
         )
@@ -34,14 +48,16 @@ public struct ObservedValue<Value>: DynamicProperty {
     public subscript<Subject>(
         dynamicMember keyPath: WritableKeyPath<Value, Subject>
     ) -> ObservedValue<Subject> {
-        .init(base[dynamicMember: keyPath])
+        ObservedValue<Subject>(base[dynamicMember: keyPath])
     }
 }
 
 // MARK: - API
 
 extension ObservedValue {
-    public init(_ base: @autoclosure @escaping () -> AnyObservableValue<Value>) {
+    public init(
+        _ base: @autoclosure @escaping () -> AnyObservableValue<Value>
+    ) {
         self._base = .init(wrappedValue: base())
     }
 
@@ -54,9 +70,18 @@ extension ObservedValue {
 
     public init<Root: ObservableObject>(
         _ keyPath: ReferenceWritableKeyPath<Root, Value>,
-        on root: Root
+        on root: Root,
+        deferUpdates: Bool? = nil
     ) {
-        self.init(ObservableValues.ObjectMember(root: root, keyPath: keyPath))
+        self.init(
+            ObservableValues.ObjectMember(
+                root: root,
+                keyPath: keyPath,
+                configuration: .init(
+                    deferUpdates: deferUpdates
+                )
+            )
+        )
     }
 
     public static func constant(

diff --git a/Sources/SwiftUIX/Intramodular/Dynamic Properties/PersistentObject.swift b/Sources/SwiftUIX/Intramodular/Dynamic Properties/PersistentObject.swift
@@ -29,7 +29,7 @@ public struct PersistentObject<Value>: DynamicProperty {
         } nonmutating set {
             _ = foo
 
-            observedObjectContainer.objectWillChange.send()
+            observedObjectContainer._objectWillChange_send()
 
             objectContainer.__unsafe_opaque_base = newValue
             observedObjectContainer.__unsafe_opaque_base = objectContainer.__unsafe_opaque_base

diff --git a/Sources/SwiftUIX/Intramodular/Dynamic Properties/TimerState.swift b/Sources/SwiftUIX/Intramodular/Dynamic Properties/TimerState.swift
@@ -2,6 +2,7 @@
 // Copyright (c) Vatsal Manot
 //
 
+import _SwiftUIX
 import Combine
 import Dispatch
 import Swift
@@ -15,7 +16,7 @@ public struct TimerState: DynamicProperty {
     private class ValueBox: ObservableObject {
         var value: Int {
             willSet {
-                objectWillChange.send()
+                _objectWillChange_send()
             }
         }
 

diff --git a/Sources/SwiftUIX/Intramodular/Dynamic Properties/UserStorage.swift b/Sources/SwiftUIX/Intramodular/Dynamic Properties/UserStorage.swift
@@ -205,10 +205,10 @@ extension UserStorage {
                 do {
                     if configuration.deferUpdates {
                         Task(priority: .userInitiated) { @MainActor in
-                            objectWillChange.send()
+                            _objectWillChange_send()
                         }
                     } else {
-                        objectWillChange.send()
+                        _objectWillChange_send()
                     }
 
                     storedValue = newValue

diff --git a/Sources/SwiftUIX/Intramodular/Dynamic Properties/ViewStorage.swift b/Sources/SwiftUIX/Intramodular/Dynamic Properties/ViewStorage.swift
@@ -28,7 +28,7 @@ public struct ViewStorage<Value>: Identifiable, DynamicProperty {
         fileprivate init(_ value: Value) {
             self.value = value
 
-            super.init()
+            super.init(configuration: AnyObservableValue.Configuration())
         }
     }
 

diff --git a/Sources/SwiftUIX/Intramodular/Keyboard/Keyboard.swift b/Sources/SwiftUIX/Intramodular/Keyboard/Keyboard.swift
@@ -53,7 +53,7 @@ public final class Keyboard: ObservableObject {
         self.keyboardWillShowSubscription = notificationCenter
             .publisher(for: UIResponder.keyboardWillShowNotification)
             .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { _ in self.objectWillChange.send() })
+            .sink(receiveValue: { _ in self._objectWillChange_send() })
 
         self.keyboardDidShowSubscription = notificationCenter
             .publisher(for: UIResponder.keyboardDidShowNotification)
@@ -65,7 +65,7 @@ public final class Keyboard: ObservableObject {
         self.keyboardWillHideSubscription = notificationCenter
             .publisher(for: UIResponder.keyboardWillHideNotification)
             .receive(on: DispatchQueue.main)
-            .sink(receiveValue: { _ in self.objectWillChange.send() })
+            .sink(receiveValue: { _ in self._objectWillChange_send() })
 
         self.keyboardDidHideSubscription = notificationCenter
             .publisher(for: UIResponder.keyboardDidHideNotification)

diff --git a/Sources/SwiftUIX/Intramodular/List/_PlatformTableViewCellView.ContentHostingView.swift b/Sources/SwiftUIX/Intramodular/List/_PlatformTableViewCellView.ContentHostingView.swift
@@ -175,7 +175,7 @@ extension _PlatformTableCellView {
                 contentHostingViewCoordinator.stateFlags.insert(.payloadDidJustUpdate)
 
                 DispatchQueue.main.async {
-                    // self.contentHostingViewCoordinator.objectWillChange.send()
+                    // self.contentHostingViewCoordinator._objectWillChange_send()
                     self.contentHostingViewCoordinator.stateFlags.remove(.payloadDidJustUpdate)
                 }
             }

diff --git a/Sources/SwiftUIX/Intramodular/Miscellaneous/Utility Views/EmptyObservableObject.swift b/Sources/SwiftUIX/Intramodular/Miscellaneous/Utility Views/EmptyObservableObject.swift
@@ -14,7 +14,7 @@ public final class EmptyObservableObject: ObservableObject, Hashable {
     }
 
     public func notify() {
-        objectWillChange.send()
+        _objectWillChange_send()
     }
 
     public static func == (lhs: EmptyObservableObject, rhs: EmptyObservableObject) -> Bool {

diff --git a/Sources/SwiftUIX/Intramodular/Screen/Screen.swift b/Sources/SwiftUIX/Intramodular/Screen/Screen.swift
@@ -68,7 +68,7 @@ public class Screen: ObservableObject {
             object: nil,
             queue: .main,
             using: { [weak self] notification in
-                self?.objectWillChange.send()
+                self?._objectWillChange_send()
             }
         )
         #endif