Skip to content

Commit bdb6299

Browse files
mbrandonwmluisbrown
authored andcommitted
Small clean up.
(cherry picked from commit 70ec7ec37865919e292acff853607e16b1dd5017)
1 parent b6ea5b0 commit bdb6299

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

Sources/ComposableArchitecture/Internal/_StateObject.swift

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import SwiftUI
55
struct _StateObject<Object: ObservableObject>: DynamicProperty {
66
private final class Observed: ObservableObject {
77
lazy var objectWillChange = ObservableObjectPublisher()
8-
init() {}
98
}
109

1110
private final class Storage {
@@ -17,29 +16,26 @@ struct _StateObject<Object: ObservableObject>: DynamicProperty {
1716
func forwardObjectWillChange(to objectWillChange: ObservableObjectPublisher) {
1817
self.objectWillChange = objectWillChange
1918

20-
if subscription == nil {
21-
subscription = object.objectWillChange.sink { [weak self] _ in
22-
guard let objectWillChange = self?.objectWillChange else { return }
23-
objectWillChange.send()
19+
if self.subscription == nil {
20+
self.subscription = self.object.objectWillChange.sink { [weak self] _ in
21+
self?.objectWillChange?.send()
2422
}
2523
}
2624
}
27-
28-
init() {}
2925
}
3026

3127
@ObservedObject private var observedObject = Observed()
3228
@State private var storage = Storage()
3329

3430
init(wrappedValue: @autoclosure @escaping () -> Object) {
35-
storage.initially = wrappedValue
31+
self.storage.initially = wrappedValue
3632
}
3733

3834
func update() {
39-
storage.forwardObjectWillChange(to: observedObject.objectWillChange)
35+
self.storage.forwardObjectWillChange(to: self.observedObject.objectWillChange)
4036
}
4137

4238
var wrappedValue: Object {
43-
storage.object
39+
self.storage.object
4440
}
4541
}

0 commit comments

Comments
 (0)