Skip to content

Commit

Permalink
Run swift-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@mluisbrown @actions-user
mluisbrown authored and actions-user committed Feb 19, 2021
1 parent ce7a9d1 commit 3a4583b
Show file tree
Hide file tree
Showing 2 changed files with 174 additions and 173 deletions.
63 changes: 32 additions & 31 deletions Sources/ComposableArchitecture/SwiftUI/Binding.swift
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import CasePaths

#if canImport(SwiftUI)
import SwiftUI
import SwiftUI
#endif

/// An action that describes simple mutations to some root state at a writable key path.
Expand Down Expand Up @@ -127,7 +128,7 @@ import SwiftUI
///
public struct BindingAction<Root>: Equatable {
public let keyPath: PartialKeyPath<Root>

fileprivate let set: (inout Root) -> Void
private let value: Any
private let valueIsEqualTo: (Any) -> Bool
Expand Down Expand Up @@ -214,34 +215,34 @@ extension Reducer {
}

#if canImport(SwiftUI)
extension ViewStore {
/// Derives a binding from the store that mutates state at the given writable key path by wrapping
/// a `BindingAction` with the store's action type.
///
/// For example, a text field binding can be created like this:
///
/// struct State { var text = "" }
/// enum Action { case binding(BindingAction<State>) }
///
/// TextField(
/// "Enter text",
/// text: viewStore.binding(keyPath: \.text, Action.binding)
/// )
///
/// - Parameters:
/// - keyPath: A writable key path from the view store's state to a mutable field
/// - action: A function that wraps a binding action in the view store's action type.
/// - Returns: A binding.
@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
public func binding<LocalState>(
keyPath: WritableKeyPath<State, LocalState>,
send action: @escaping (BindingAction<State>) -> Action
) -> Binding<LocalState>
where LocalState: Equatable {
self.binding(
get: { $0[keyPath: keyPath] },
send: { action(.set(keyPath, $0)) }
)
extension ViewStore {
/// Derives a binding from the store that mutates state at the given writable key path by wrapping
/// a `BindingAction` with the store's action type.
///
/// For example, a text field binding can be created like this:
///
/// struct State { var text = "" }
/// enum Action { case binding(BindingAction<State>) }
///
/// TextField(
/// "Enter text",
/// text: viewStore.binding(keyPath: \.text, Action.binding)
/// )
///
/// - Parameters:
/// - keyPath: A writable key path from the view store's state to a mutable field
/// - action: A function that wraps a binding action in the view store's action type.
/// - Returns: A binding.
@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
public func binding<LocalState>(
keyPath: WritableKeyPath<State, LocalState>,
send action: @escaping (BindingAction<State>) -> Action
) -> Binding<LocalState>
where LocalState: Equatable {
self.binding(
get: { $0[keyPath: keyPath] },
send: { action(.set(keyPath, $0)) }
)
}
}
}
#endif
284 changes: 142 additions & 142 deletions Sources/ComposableArchitecture/SwiftUI/ForEachStore.swift
View file
Original file line number Diff line number Diff line change
@@ -1,158 +1,158 @@
#if canImport(SwiftUI)
import SwiftUI
import SwiftUI

/// A Composable Architecture-friendly wrapper around `ForEach` that simplifies working with
/// collections of state.
///
/// `ForEachStore` loops over a store's collection with a store scoped to the domain of each
/// element. This allows you to extract and modularize an element's view and avoid concerns around
/// collection index math and parent-child store communication.
///
/// For example, a todos app may define the domain and logic associated with an individual todo:
///
/// struct TodoState: Equatable, Identifiable {
/// let id: UUID
/// var description = ""
/// var isComplete = false
/// }
/// enum TodoAction {
/// case isCompleteToggled(Bool)
/// case descriptionChanged(String)
/// }
/// struct TodoEnvironment {}
/// let todoReducer = Reducer<TodoState, TodoAction, TodoEnvironment { ... }
///
/// As well as a view with a domain-specific store:
///
/// struct TodoView: View {
/// let store: Store<TodoState, TodoAction>
/// var body: some View { ... }
/// }
///
/// For a parent domain to work with a collection of todos, it can hold onto this collection in
/// state:
///
/// struct AppState: Equatable {
/// var todos: IdentifiedArrayOf<TodoState> = []
/// }
///
/// Define a case to handle actions sent to the child domain:
///
/// enum AppAction {
/// case todo(id: TodoState.ID, action: TodoAction)
/// }
///
/// Enhance its reducer using `forEach`:
///
/// let appReducer = todoReducer.forEach(
/// state: \.todos,
/// action: /AppAction.todo(id:action:),
/// environment: { _ in TodoEnvironment() }
/// )
///
/// And finally render a list of `TodoView`s using `ForEachStore`:
///
/// ForEachStore(
/// self.store.scope(state: \.todos, AppAction.todo(id:action:))
/// ) { todoStore in
/// TodoView(store: todoStore)
/// }
@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
public struct ForEachStore<EachState, EachAction, Data, ID, Content>: DynamicViewContent
where Data: Collection, ID: Hashable, Content: View {
public let data: Data
private let content: () -> Content

/// Initializes a structure that computes views on demand from a store on an array of data and an
/// indexed action.
/// A Composable Architecture-friendly wrapper around `ForEach` that simplifies working with
/// collections of state.
///
/// `ForEachStore` loops over a store's collection with a store scoped to the domain of each
/// element. This allows you to extract and modularize an element's view and avoid concerns around
/// collection index math and parent-child store communication.
///
/// For example, a todos app may define the domain and logic associated with an individual todo:
///
/// struct TodoState: Equatable, Identifiable {
/// let id: UUID
/// var description = ""
/// var isComplete = false
/// }
/// enum TodoAction {
/// case isCompleteToggled(Bool)
/// case descriptionChanged(String)
/// }
/// struct TodoEnvironment {}
/// let todoReducer = Reducer<TodoState, TodoAction, TodoEnvironment { ... }
///
/// As well as a view with a domain-specific store:
///
/// struct TodoView: View {
/// let store: Store<TodoState, TodoAction>
/// var body: some View { ... }
/// }
///
/// For a parent domain to work with a collection of todos, it can hold onto this collection in
/// state:
///
/// struct AppState: Equatable {
/// var todos: IdentifiedArrayOf<TodoState> = []
/// }
///
/// Define a case to handle actions sent to the child domain:
///
/// enum AppAction {
/// case todo(id: TodoState.ID, action: TodoAction)
/// }
///
/// Enhance its reducer using `forEach`:
///
/// - Parameters:
/// - store: A store on an array of data and an indexed action.
/// - id: A key path identifying an element.
/// - content: A function that can generate content given a store of an element.
public init<EachContent>(
_ store: Store<Data, (Data.Index, EachAction)>,
id: KeyPath<EachState, ID>,
content: @escaping (Store<EachState, EachAction>) -> EachContent
)
where
Data == [EachState],
EachContent: View,
Content == WithViewStore<
[ID], (Data.Index, EachAction), ForEach<[(offset: Int, element: ID)], ID, EachContent>
>
{
let data = store.state
self.data = data
self.content = {
WithViewStore(store.scope(state: { $0.map { $0[keyPath: id] } })) { viewStore in
ForEach(Array(viewStore.state.enumerated()), id: \.element) { index, _ in
content(
store.scope(
state: { index < $0.endIndex ? $0[index] : data[index] },
action: { (index, $0) }
/// let appReducer = todoReducer.forEach(
/// state: \.todos,
/// action: /AppAction.todo(id:action:),
/// environment: { _ in TodoEnvironment() }
/// )
///
/// And finally render a list of `TodoView`s using `ForEachStore`:
///
/// ForEachStore(
/// self.store.scope(state: \.todos, AppAction.todo(id:action:))
/// ) { todoStore in
/// TodoView(store: todoStore)
/// }
@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
public struct ForEachStore<EachState, EachAction, Data, ID, Content>: DynamicViewContent
where Data: Collection, ID: Hashable, Content: View {
public let data: Data
private let content: () -> Content

/// Initializes a structure that computes views on demand from a store on an array of data and an
/// indexed action.
///
/// - Parameters:
/// - store: A store on an array of data and an indexed action.
/// - id: A key path identifying an element.
/// - content: A function that can generate content given a store of an element.
public init<EachContent>(
_ store: Store<Data, (Data.Index, EachAction)>,
id: KeyPath<EachState, ID>,
content: @escaping (Store<EachState, EachAction>) -> EachContent
)
where
Data == [EachState],
EachContent: View,
Content == WithViewStore<
[ID], (Data.Index, EachAction), ForEach<[(offset: Int, element: ID)], ID, EachContent>
>
{
let data = store.state
self.data = data
self.content = {
WithViewStore(store.scope(state: { $0.map { $0[keyPath: id] } })) { viewStore in
ForEach(Array(viewStore.state.enumerated()), id: \.element) { index, _ in
content(
store.scope(
state: { index < $0.endIndex ? $0[index] : data[index] },
action: { (index, $0) }
)
)
)
}
}
}
}
}

/// Initializes a structure that computes views on demand from a store on an array of data and an
/// indexed action.
///
/// - Parameters:
/// - store: A store on an array of data and an indexed action.
/// - content: A function that can generate content given a store of an element.
public init<EachContent>(
_ store: Store<Data, (Data.Index, EachAction)>,
content: @escaping (Store<EachState, EachAction>) -> EachContent
)
where
Data == [EachState],
EachContent: View,
Content == WithViewStore<
[ID], (Data.Index, EachAction), ForEach<[(offset: Int, element: ID)], ID, EachContent>
>,
EachState: Identifiable,
EachState.ID == ID
{
self.init(store, id: \.id, content: content)
}
/// Initializes a structure that computes views on demand from a store on an array of data and an
/// indexed action.
///
/// - Parameters:
/// - store: A store on an array of data and an indexed action.
/// - content: A function that can generate content given a store of an element.
public init<EachContent>(
_ store: Store<Data, (Data.Index, EachAction)>,
content: @escaping (Store<EachState, EachAction>) -> EachContent
)
where
Data == [EachState],
EachContent: View,
Content == WithViewStore<
[ID], (Data.Index, EachAction), ForEach<[(offset: Int, element: ID)], ID, EachContent>
>,
EachState: Identifiable,
EachState.ID == ID
{
self.init(store, id: \.id, content: content)
}

/// Initializes a structure that computes views on demand from a store on a collection of data and
/// an identified action.
///
/// - Parameters:
/// - store: A store on an identified array of data and an identified action.
/// - content: A function that can generate content given a store of an element.
public init<EachContent: View>(
_ store: Store<IdentifiedArray<ID, EachState>, (ID, EachAction)>,
content: @escaping (Store<EachState, EachAction>) -> EachContent
)
where
EachContent: View,
Data == IdentifiedArray<ID, EachState>,
Content == WithViewStore<[ID], (ID, EachAction), ForEach<[ID], ID, EachContent>>
{
let data = store.state
self.data = data
self.content = {
WithViewStore(store.scope(state: { $0.ids })) { viewStore in
ForEach(viewStore.state, id: \.self) { id in
content(
store.scope(
state: { $0[id: id] ?? data[id: id]! },
action: { (id, $0) }
/// Initializes a structure that computes views on demand from a store on a collection of data and
/// an identified action.
///
/// - Parameters:
/// - store: A store on an identified array of data and an identified action.
/// - content: A function that can generate content given a store of an element.
public init<EachContent: View>(
_ store: Store<IdentifiedArray<ID, EachState>, (ID, EachAction)>,
content: @escaping (Store<EachState, EachAction>) -> EachContent
)
where
EachContent: View,
Data == IdentifiedArray<ID, EachState>,
Content == WithViewStore<[ID], (ID, EachAction), ForEach<[ID], ID, EachContent>>
{
let data = store.state
self.data = data
self.content = {
WithViewStore(store.scope(state: { $0.ids })) { viewStore in
ForEach(viewStore.state, id: \.self) { id in
content(
store.scope(
state: { $0[id: id] ?? data[id: id]! },
action: { (id, $0) }
)
)
)
}
}
}
}
}

public var body: some View {
self.content()
public var body: some View {
self.content()
}
}
}
#endif

0 comments on commit 3a4583b

Please sign in to comment.