Share state appstorage nullable (#3174)

* failing AppStorageKey stored value and set to nil * setting SharedAppStorageLocals when removing * Clean up --------- Co-authored-by: Brandon Williams <mbrandonw@hey.com>
pointfreeco · Jun 17, 2024 · 964c9aa · 964c9aa
1 parent fd9ef56
commit 964c9aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Sources/ComposableArchitecture/SharedState/References/ValueReference.swift b/Sources/ComposableArchitecture/SharedState/References/ValueReference.swift
@@ -139,7 +139,7 @@ extension Shared {
     line: UInt = #line
   ) where Key.Value == Value {
     self.init(
-      wrappedValue: persistenceKey.load(initialValue: nil) ?? persistenceKey.defaultValue(),
+      wrappedValue: persistenceKey.defaultValue(),
       persistenceKey.base,
       fileID: fileID,
       line: line
@@ -297,7 +297,7 @@ extension SharedReader {
     line: UInt = #line
   ) where Key.Value == Value {
     self.init(
-      wrappedValue: persistenceKey.load(initialValue: nil) ?? persistenceKey.defaultValue(),
+      wrappedValue: persistenceKey.defaultValue(),
       persistenceKey.base,
       fileID: fileID,
       line: line

diff --git a/Tests/ComposableArchitectureTests/SharedTests.swift b/Tests/ComposableArchitectureTests/SharedTests.swift
@@ -934,6 +934,19 @@ final class SharedTests: XCTestCase {
     XCTAssertEqual(count, count)
     XCTAssertEqual(count.wrappedValue, count.wrappedValue)
   }
+
+  func testDefaultVersusValueInExternalStorage() {
+    @Dependency(\.defaultAppStorage) var userDefaults
+    userDefaults.set(true, forKey: "optionalValueWithDefault")
+
+    @Shared(.optionalValueWithDefault) var optionalValueWithDefault
+
+    XCTAssertNotNil(optionalValueWithDefault)
+
+    $optionalValueWithDefault.withLock { $0 = nil }
+
+    XCTAssertNil(optionalValueWithDefault)
+  }
 }
 
 @Reducer