1919import SwiftUI
2020
2121/// Grid-based table
22- public struct TablerGrid < Element, Header, Row, RowBack, Results> : View
22+ public struct TablerGrid < Element, Header, Row, RowBack, RowOver , Results> : View
2323 where Element: Identifiable ,
2424 Header: View ,
2525 Row: View ,
2626 RowBack: View ,
27+ RowOver: View ,
2728 Results: RandomAccessCollection ,
2829 Results. Element == Element
2930{
@@ -33,25 +34,28 @@ public struct TablerGrid<Element, Header, Row, RowBack, Results>: View
3334 public typealias HeaderContent = ( Binding < Context > ) -> Header
3435 public typealias RowContent = ( Element ) -> Row
3536 public typealias RowBackground = ( Element ) -> RowBack
37+ public typealias RowOverlay = ( Element ) -> RowOver
3638
3739 // MARK: Parameters
3840
3941 private let config : Config
4042 private let headerContent : HeaderContent
4143 private let rowContent : RowContent
4244 private let rowBackground : RowBackground
45+ private let rowOverlay : RowOverlay
4346 private var results : Results
4447
4548 public init ( _ config: Config = . init( ) ,
4649 @ViewBuilder header: @escaping HeaderContent ,
4750 @ViewBuilder row: @escaping RowContent ,
4851 @ViewBuilder rowBackground: @escaping RowBackground ,
49- results : Results )
50- {
52+ @ ViewBuilder rowOverlay : @escaping RowOverlay ,
53+ results : Results ) {
5154 self . config = config
5255 headerContent = header
5356 rowContent = row
5457 self . rowBackground = rowBackground
58+ self . rowOverlay = rowOverlay
5559 self . results = results
5660 _context = State ( initialValue: TablerContext ( config) )
5761 }
@@ -80,41 +84,106 @@ public extension TablerGrid {
8084 init ( _ config: Config ,
8185 @ViewBuilder row: @escaping RowContent ,
8286 @ViewBuilder rowBackground: @escaping RowBackground ,
87+ @ViewBuilder rowOverlay: @escaping RowOverlay ,
8388 results: Results )
8489 where Header == EmptyView
8590 {
8691 self . init ( config,
8792 header: { _ in EmptyView ( ) } ,
8893 row: row,
8994 rowBackground: rowBackground,
95+ rowOverlay: rowOverlay,
96+ results: results)
97+ }
98+
99+ // omitting Overlay
100+ init ( _ config: Config ,
101+ @ViewBuilder header: @escaping HeaderContent ,
102+ @ViewBuilder row: @escaping RowContent ,
103+ @ViewBuilder rowBackground: @escaping RowBackground ,
104+ results: Results )
105+ where RowOver == EmptyView
106+ {
107+ self . init ( config,
108+ header: header,
109+ row: row,
110+ rowBackground: rowBackground,
111+ rowOverlay: { _ in EmptyView ( ) } ,
90112 results: results)
91113 }
92114
93115 // omitting Background
94116 init ( _ config: Config ,
95117 @ViewBuilder header: @escaping HeaderContent ,
96118 @ViewBuilder row: @escaping RowContent ,
119+ @ViewBuilder rowOverlay: @escaping RowOverlay ,
97120 results: Results )
98121 where RowBack == EmptyView
99122 {
100123 self . init ( config,
101124 header: header,
102125 row: row,
103126 rowBackground: { _ in EmptyView ( ) } ,
127+ rowOverlay: rowOverlay,
128+ results: results)
129+ }
130+
131+ // omitting Header AND Overlay
132+ init ( _ config: Config ,
133+ @ViewBuilder row: @escaping RowContent ,
134+ @ViewBuilder rowBackground: @escaping RowBackground ,
135+ results: Results )
136+ where Header == EmptyView , RowOver == EmptyView
137+ {
138+ self . init ( config,
139+ header: { _ in EmptyView ( ) } ,
140+ row: row,
141+ rowBackground: rowBackground,
142+ rowOverlay: { _ in EmptyView ( ) } ,
104143 results: results)
105144 }
106145
107146 // omitting Header AND Background
108147 init ( _ config: Config ,
109148 @ViewBuilder row: @escaping RowContent ,
149+ @ViewBuilder rowOverlay: @escaping RowOverlay ,
110150 results: Results )
111151 where Header == EmptyView , RowBack == EmptyView
112152 {
113153 self . init ( config,
114154 header: { _ in EmptyView ( ) } ,
115155 row: row,
116156 rowBackground: { _ in EmptyView ( ) } ,
157+ rowOverlay: rowOverlay,
158+ results: results)
159+ }
160+
161+ // omitting Background AND Overlay
162+ init ( _ config: Config ,
163+ @ViewBuilder header: @escaping HeaderContent ,
164+ @ViewBuilder row: @escaping RowContent ,
165+ results: Results )
166+ where RowBack == EmptyView , RowOver == EmptyView
167+ {
168+ self . init ( config,
169+ header: header,
170+ row: row,
171+ rowBackground: { _ in EmptyView ( ) } ,
172+ rowOverlay: { _ in EmptyView ( ) } ,
117173 results: results)
118174 }
119175
176+ // omitting Header, Background, AND Overlay
177+ init ( _ config: Config ,
178+ @ViewBuilder row: @escaping RowContent ,
179+ results: Results )
180+ where Header == EmptyView , RowBack == EmptyView , RowOver == EmptyView
181+ {
182+ self . init ( config,
183+ header: { _ in EmptyView ( ) } ,
184+ row: row,
185+ rowBackground: { _ in EmptyView ( ) } ,
186+ rowOverlay: { _ in EmptyView ( ) } ,
187+ results: results)
188+ }
120189}
0 commit comments