Integrate header and footer views into the list view (#3)

* Integrate header and footer views into the list view * Update `CHANGELOG.md`
space-code · Aug 26, 2024 · c29b8a3 · c29b8a3
1 parent acbffab
commit c29b8a3
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,18 @@
 All notable changes to this project will be documented in this file.
 
 #### 1.x Releases
-- `1.0.x` Releases - [1.0.0](#100)
+- `1.0.x` Releases - [1.0.0](#100) | [1.1.0](#110)
+
+## [1.1.0](https://github.com/space-code/blade/releases/tag/1.1.0)
+Released on 2024-08-26.
+
+#### Added
+- Integrate header and footer views into the list view.
+  - Added in Pull Request [#3](https://github.com/space-code/blade/pull/3).
 
 ## [1.0.0](https://github.com/space-code/blade/releases/tag/1.0.0)
 Released on 2024-02-05.
 
 #### Added
 - Initial release of Blade.
-  - Added by [Nikita Vasilev](https://github.com/nik3212).
+  - Added by [Nikita Vasilev](https://github.com/nik3212).
diff --git a/Sources/BladeTCA/Classes/Presentation/ViewModifiers/LoadingViewModifier.swift b/Sources/BladeTCA/Classes/Presentation/ViewModifiers/LoadingViewModifier.swift
@@ -13,7 +13,7 @@ struct LoadingViewModifier: ViewModifier {
     // MARK: ViewModifier
 
     func body(content: Content) -> some View {
-        VStack {
+        Group {
             content
 
             if isLoading {

diff --git a/Sources/BladeTCA/Classes/Presentation/Views/PaginatorListView.swift b/Sources/BladeTCA/Classes/Presentation/Views/PaginatorListView.swift
@@ -7,41 +7,88 @@ import BladeTCA
 import ComposableArchitecture
 import SwiftUI
 
+// MARK: - PaginatorListView
+
 public struct PaginatorListView<
     State: Equatable & Identifiable,
     Action: Equatable,
+    Header: View,
     Body: View,
+    Footer: View,
     PositionType: Equatable,
     Request: Equatable
 >: View {
     // MARK: Types
 
     private typealias StoreType = ViewStoreOf<PaginatorReducer<State, Action, PositionType, Request>>
 
+    @SwiftUI.State private var isLoading = false
+
     // MARK: Properties
 
     public let store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>
+    public let header: () -> Header
     public let content: (State) -> Body
+    public let footer: () -> Footer
 
     public init(
         store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>,
-        content: @escaping (State) -> Body
+        @ViewBuilder header: @escaping () -> Header,
+        @ViewBuilder content: @escaping (State) -> Body,
+        @ViewBuilder footer: @escaping () -> Footer
     ) {
         self.store = store
+        self.header = header
         self.content = content
+        self.footer = footer
     }
 
     // MARK: View
 
     public var body: some View {
-        WithViewStore(store, observe: { $0 }) { (viewStore: StoreType) in
-            List(viewStore.items) { item in
-                content(item)
-                    .onAppear {
-                        viewStore.send(.itemAppeared(item.id))
+        List {
+            Section {
+                header()
+            }
+
+            WithViewStore(store, observe: { $0 }) { (viewStore: StoreType) in
+                Section(content: {
+                    ForEach(viewStore.items) { item in
+                        content(item)
+                            .onAppear {
+                                viewStore.send(.itemAppeared(item.id))
+                            }
                     }
+                })
+            }
+
+            Section {
+                footer()
+            }
+
+            Section {
+                EmptyView()
+                    .modifier(LoadingViewModifier(isLoading: isLoading))
             }
-            .modifier(LoadingViewModifier(isLoading: viewStore.isLoading && !viewStore.items.isEmpty))
         }
     }
 }
+
+public extension PaginatorListView where Header == EmptyView, Footer == EmptyView {
+    init(
+        store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>,
+        @ViewBuilder content: @escaping (State) -> Body
+    ) {
+        self.init(store: store, header: { EmptyView() }, content: content, footer: { EmptyView() })
+    }
+}
+
+public extension PaginatorListView where Header: View, Footer == EmptyView {
+    init(
+        store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>,
+        header: @escaping () -> Header,
+        @ViewBuilder content: @escaping (State) -> Body
+    ) {
+        self.init(store: store, header: header, content: content, footer: { EmptyView() })
+    }
+}
diff --git a/Sources/BladeTCA/Classes/Presentation/Views/PaginatorView.swift b/Sources/BladeTCA/Classes/Presentation/Views/PaginatorView.swift
@@ -14,7 +14,9 @@ public struct PaginatorView<
     Action: Equatable,
     PositionType: Equatable,
     Request: Equatable,
+    Header: View,
     Body: View,
+    Footer: View,
     RowContent: View
 >: View {
     // MARK: Types
@@ -24,35 +26,66 @@ public struct PaginatorView<
     // MARK: Properties
 
     public let store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>
+    public let header: () -> Header
     public let content: ([State], @escaping (State) -> AnyView) -> Body
+    public let footer: () -> Footer
     public let rowContent: (State) -> RowContent
 
     // MARK: Initialization
 
     public init(
         store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>,
+        @ViewBuilder header: @escaping () -> Header,
         @ViewBuilder content: @escaping ([State], @escaping (State) -> AnyView) -> Body,
+        @ViewBuilder footer: @escaping () -> Footer,
         @ViewBuilder rowContent: @escaping (State) -> RowContent
     ) {
         self.store = store
+        self.header = header
         self.content = content
+        self.footer = footer
         self.rowContent = rowContent
     }
 
     // MARK: View
 
     public var body: some View {
         WithViewStore(store, observe: { $0 }) { (viewStore: StoreType) in
+            header()
+
             content(viewStore.items.elements) { item in
                 rowContent(item)
                     .onAppear { viewStore.send(.itemAppeared(item.id)) }
                     .any
             }
             .modifier(LoadingViewModifier(isLoading: viewStore.isLoading && !viewStore.items.isEmpty))
+
+            footer()
         }
     }
 }
 
+public extension PaginatorView where Header == EmptyView, Footer == EmptyView {
+    init(
+        store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>,
+        @ViewBuilder content: @escaping ([State], @escaping (State) -> AnyView) -> Body,
+        @ViewBuilder rowContent: @escaping (State) -> RowContent
+    ) {
+        self.init(store: store, header: { EmptyView() }, content: content, footer: { EmptyView() }, rowContent: rowContent)
+    }
+}
+
+public extension PaginatorView where Header: View, Footer == EmptyView {
+    init(
+        store: Store<PaginatorState<State, PositionType>, PaginatorAction<State, Action, Request>>,
+        header: @escaping () -> Header,
+        @ViewBuilder content: @escaping ([State], @escaping (State) -> AnyView) -> Body,
+        @ViewBuilder rowContent: @escaping (State) -> RowContent
+    ) {
+        self.init(store: store, header: header, content: content, footer: { EmptyView() }, rowContent: rowContent)
+    }
+}
+
 // MARK: Extension
 
 private extension View {