Add objectWillChange notification (#85)

0xLeif · Jan 25, 2024 · c72c820 · c72c820
1 parent 662afd6
commit c72c820
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Sources/AppState/Application/Types/Dependency/Slice/Application+DependencySlice.swift b/Sources/AppState/Application/Types/Dependency/Slice/Application+DependencySlice.swift
@@ -30,6 +30,11 @@ extension Application.DependencySlice where SliceKeyPath == WritableKeyPath<Valu
     /// The current dependency value.
     public var value: SliceValue {
         get { dependency.value[keyPath: keyPath] }
-        set { dependency.value[keyPath: keyPath] = newValue }
+        set {
+            #if !os(Linux) && !os(Windows)
+            Application.shared.objectWillChange.send()
+            #endif
+            dependency.value[keyPath: keyPath] = newValue
+        }
     }
 }
diff --git a/Sources/AppState/Application/Types/State/Application+SecureState.swift b/Sources/AppState/Application/Types/State/Application+SecureState.swift
@@ -27,10 +27,8 @@ extension Application {
                 return storedValue
             }
             set {
-                defer {
-                    shared.objectWillChange.send()
-                }
-
+                shared.objectWillChange.send()
+
                 guard let newValue else {
                     return keychain.remove(scope.key)
                 }

diff --git a/Sources/AppState/PropertyWrappers/Dependency/Slice/DependencySlice.swift b/Sources/AppState/PropertyWrappers/Dependency/Slice/DependencySlice.swift
@@ -47,6 +47,9 @@ import SwiftUI
             )
 
             var dependency = app.value(keyPath: dependencyKeyPath)
+            #if !os(Linux) && !os(Windows)
+            Application.shared.objectWillChange.send()
+            #endif
             dependency.value[keyPath: valueKeyPath] = newValue
         }
     }