Skip to content

Use @State over @StateObject #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Use @State over @StateObject #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1918011
Use State in ViewContext
ra1028 Sep 24, 2024
54a0de8
Use State in AtomRoot
ra1028 Sep 24, 2024
e277664
Use State in AtomScope
ra1028 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 25 additions & 33 deletions Sources/Atoms/AtomRoot.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ import SwiftUI
/// ```
///
public struct AtomRoot<Content: View>: View {
private var storeHost: StoreHost
private var storage: Storage
private var overrides = [OverrideKey: any OverrideProtocol]()
private var observers = [Observer]()
private let content: Content
Expand All @@ -70,7 +70,7 @@ public struct AtomRoot<Content: View>: View {
///
/// - Parameter content: The descendant view content that provides context for atoms.
public init(@ViewBuilder content: () -> Content) {
self.storeHost = .tree
self.storage = .managed
self.content = content()
}

Expand All @@ -84,26 +84,26 @@ public struct AtomRoot<Content: View>: View {
storesIn store: AtomStore,
@ViewBuilder content: () -> Content
) {
self.storeHost = .unmanaged(store: store)
self.storage = .unmanaged(store: store)
self.content = content()
}

/// The content and behavior of the view.
public var body: some View {
switch storeHost {
case .tree:
TreeManaged(
content: content,
switch storage {
case .managed:
Managed(
overrides: overrides,
observers: observers
observers: observers,
content: content
)

case .unmanaged(let store):
Unmanaged(
content: content,
store: store,
overrides: overrides,
observers: observers
observers: observers,
content: content
)
}
}
Expand Down Expand Up @@ -150,31 +150,28 @@ public struct AtomRoot<Content: View>: View {
}

private extension AtomRoot {
enum StoreHost {
case tree
enum Storage {
case managed
case unmanaged(store: AtomStore)
}

struct TreeManaged: View {
@MainActor
final class State: ObservableObject {
let store = AtomStore()
let token = ScopeKey.Token()
}

let content: Content
struct Managed: View {
let overrides: [OverrideKey: any OverrideProtocol]
let observers: [Observer]
let content: Content

@State
private var store = AtomStore()

@StateObject
private var state = State()
@State
private var token = ScopeKey.Token()

var body: some View {
content.environment(
\.store,
StoreContext(
store: state.store,
scopeKey: ScopeKey(token: state.token),
store: store,
scopeKey: ScopeKey(token: token),
inheritedScopeKeys: [:],
observers: observers,
scopedObservers: [],
Expand All @@ -186,25 +183,20 @@ private extension AtomRoot {
}

struct Unmanaged: View {
@MainActor
final class State: ObservableObject {
let token = ScopeKey.Token()
}

let content: Content
let store: AtomStore
let overrides: [OverrideKey: any OverrideProtocol]
let observers: [Observer]
let content: Content

@StateObject
private var state = State()
@State
private var token = ScopeKey.Token()

var body: some View {
content.environment(
\.store,
StoreContext(
store: store,
scopeKey: ScopeKey(token: state.token),
scopeKey: ScopeKey(token: token),
inheritedScopeKeys: [:],
observers: observers,
scopedObservers: [],
Expand Down
32 changes: 14 additions & 18 deletions Sources/Atoms/AtomScope.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,19 @@ public struct AtomScope<Content: View>: View {
public var body: some View {
switch inheritance {
case .environment(let id):
InheritedEnvironment(
WithEnvironment(
id: id,
content: content,
overrides: overrides,
observers: observers
observers: observers,
content: content
)

case .context(let store):
InheritedContext(
content: content,
WithContext(
store: store,
overrides: overrides,
observers: observers
observers: observers,
content: content
)
}
}
Expand Down Expand Up @@ -158,27 +158,23 @@ private extension AtomScope {
case context(store: StoreContext)
}

struct InheritedEnvironment: View {
@MainActor
final class State: ObservableObject {
let token = ScopeKey.Token()
}

struct WithEnvironment: View {
let id: ScopeID
let content: Content
let overrides: [OverrideKey: any OverrideProtocol]
let observers: [Observer]
let content: Content

@State
private var token = ScopeKey.Token()

@StateObject
private var state = State()
@Environment(\.store)
private var environmentStore

var body: some View {
content.environment(
\.store,
environmentStore?.scoped(
scopeKey: ScopeKey(token: state.token),
scopeKey: ScopeKey(token: token),
scopeID: id,
observers: observers,
overrides: overrides
Expand All @@ -187,11 +183,11 @@ private extension AtomScope {
}
}

struct InheritedContext: View {
let content: Content
struct WithContext: View {
let store: StoreContext
let overrides: [OverrideKey: any OverrideProtocol]
let observers: [Observer]
let content: Content

var body: some View {
content.environment(
Expand Down
25 changes: 14 additions & 11 deletions Sources/Atoms/PropertyWrapper/ViewContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@ import SwiftUI
///
@propertyWrapper
public struct ViewContext: DynamicProperty {
@StateObject
private var state = State()
@State
private var phase = false

@State
private var subscriberState = SubscriberState()

@Environment(\.store)
private var _store
Expand All @@ -54,25 +57,25 @@ public struct ViewContext: DynamicProperty {
/// Instead, you use the property variable created with the `@ViewContext` attribute.
@MainActor
public var wrappedValue: AtomViewContext {
AtomViewContext(
let phase = $phase

// Initializes State and starts observing for updates.
_ = phase.wrappedValue

return AtomViewContext(
store: store,
subscriber: Subscriber(state.subscriberState),
subscriber: Subscriber(subscriberState),
subscription: Subscription(
location: location,
update: { [weak state] in
state?.objectWillChange.send()
update: {
phase.wrappedValue.toggle()
}
)
)
}
}

private extension ViewContext {
@MainActor
final class State: ObservableObject {
let subscriberState = SubscriberState()
}

@MainActor
var store: StoreContext {
guard let _store else {
Expand Down