add HighlightableItem to WrappedCells

Author: NullIsOne

Components/Sources/Common/Views/StackView.swift

@@ -49,7 +49,7 @@ extension StackView: ConfigurableItem {
             }
 
             /// Only for stack. Cannot be included in common macros.
-            public static func children(@GeneratorsBuilder<ViewGenerator>_ content: @escaping (ViewContext.Type) -> [ViewGenerator]) -> Property {
+            public static func children(@GeneratorsBuilder<ViewGenerator>_ content: @escaping ViewContext.CellsBuilder) -> Property {
                 .init(closure: { model in
                     var model = model
                     model.set(children: content(ViewContext.self))

Source/Collection/CollectionSection.swift

@@ -23,7 +23,7 @@ public extension CollectionSection {
 
     static func create(header: HeaderGeneratorType,
                        footer: FooterGeneratorType,
-                       @GeneratorsBuilder<GeneratorType> generators: (CollectionContext.Type) -> [GeneratorType]) -> Self {
+                       @GeneratorsBuilder<GeneratorType> generators: CollectionContext.CellsBuilder) -> Self {
         Self(generators: generators(CollectionContext.self), header: header, footer: footer)
     }
 

Source/Collection/Generators/CollectionContext.swift

@@ -11,7 +11,7 @@ import Foundation
 public struct CollectionContext: BuilderContext {
 
     public typealias ViewType = UICollectionViewCell
-    public typealias GeneratorType = CollectionCellGenerator
+    public typealias CellsBuilder = (CollectionContext.Type) -> [CollectionCellGenerator]
 
     public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> BaseCellGenerator<CollectionWrappedCell<Item>> where Item: BaseItem {
         Item.rddm.collectionGenerator(with: model)

Source/Collection/Wrapper/CollectionWrappedCell.swift

@@ -57,3 +57,25 @@ extension CollectionWrappedCell: CalculatableWidthItem where View: CalculatableW
     }
 
 }
+
+// MARK: - HighlightableItem
+
+extension CollectionWrappedCell: HighlightableItem where View: HighlightableItem {
+
+    public func applyUnhighlightedStyle() {
+        nestedView.applyUnhighlightedStyle()
+    }
+
+    public func applyHighlightedStyle() {
+        nestedView.applyHighlightedStyle()
+    }
+
+    public func applySelectedStyle() {
+        nestedView.applySelectedStyle()
+    }
+
+    public func applyDeselectedStyle() {
+        nestedView.applyDeselectedStyle()
+    }
+
+}

Source/Common/Generators/BaseCellGenerator.swift

@@ -146,7 +146,7 @@ public extension BaseCellGenerator where Cell: FoldableStateHolder, Cell: UITabl
 
     /// Creates FoldableCellGenerator with children generated by resultBuilder
     /// - Parameter content: resultBuilder based closure that returns array of children
-    func asFoldable(@GeneratorsBuilder<TableCellGenerator>_ content: @escaping (TableContext.Type) -> [TableCellGenerator]) -> FoldableCellGenerator<Cell> {
+    func asFoldable(@GeneratorsBuilder<TableCellGenerator>_ content: @escaping TableContext.CellsBuilder) -> FoldableCellGenerator<Cell> {
         return .init(with: model,
                      registerType: registerType)
             .children(content)

Source/Common/Generators/FoldableCellGenerator.swift

@@ -93,7 +93,7 @@ public extension FoldableCellGenerator {
         self.isExpanded = isExpanded
         return self
     }
-    
+
     /// - Parameter closure: handler closure for folded/unfolded events
     func didFoldEvent(_ closure: @escaping (Bool) -> Void) -> Self {
         self.didFoldEvent.addListner(closure)
@@ -117,7 +117,7 @@ public extension FoldableCellGenerator where Cell: UITableViewCell {
     }
 
     /// - Parameter content: resultBuilder based closure that returns an array of child generators
-    func children(@GeneratorsBuilder<TableCellGenerator>_ content: @escaping (TableContext.Type) -> [TableCellGenerator]) -> Self {
+    func children(@GeneratorsBuilder<TableCellGenerator>_ content: @escaping TableContext.CellsBuilder) -> Self {
         self.children = content(TableContext.self)
         return self
     }
@@ -133,7 +133,7 @@ public extension FoldableCellGenerator where Cell: UICollectionViewCell {
     }
 
     /// - Parameter content: resultBuilder based closure that returns an array of child generators
-    func children(@GeneratorsBuilder<CollectionCellGenerator>_ content: @escaping (CollectionContext.Type) -> [CollectionCellGenerator]) -> Self {
+    func children(@GeneratorsBuilder<CollectionCellGenerator>_ content: @escaping CollectionContext.CellsBuilder) -> Self {
         self.children = content(CollectionContext.self)
         return self
     }

Source/Stack/Generators/ViewContext.swift

@@ -11,7 +11,7 @@ import Foundation
 public struct ViewContext: BuilderContext {
 
     public typealias ViewType = UIView
-    public typealias GeneratorType = ViewGenerator
+    public typealias CellsBuilder = (ViewContext.Type) -> [ViewGenerator]
 
     public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> BaseViewGenerator<Item> where Item: BaseItem {
         Item.rddm.viewGenerator(with: model, and: Item.prefferedRegistration)

Source/Table/Generators/BaseNonReusableCellGenerator.swift

@@ -13,7 +13,8 @@ import UIKit
 /// Term *non-reusable* means that we are creating cell manually with constructor type defined in **ConstractableItem**.
 /// In other words this generator will not use `tableView.deqeueReusableCell`.
 ///  - Warning: Do not use this generators in tables with many cells of same type. Because you may catch perfomance issues.
-open class BaseNonReusableCellGenerator<Cell: ConfigurableItem & ConstractableItem>: TableCellGenerator & SelectableItem where Cell: UITableViewCell {
+open class BaseNonReusableCellGenerator<Cell: ConfigurableItem & ConstractableItem>: TableCellGenerator & SelectableItem
+where Cell: UITableViewCell {
 
     // MARK: - Public Properties
 

Source/Table/Generators/TableContext.swift

@@ -11,7 +11,7 @@ import Foundation
 public struct TableContext: BuilderContext {
 
     public typealias ViewType = UITableViewCell
-    public typealias GeneratorType = TableCellGenerator
+    public typealias CellsBuilder = (TableContext.Type) -> [TableCellGenerator]
 
     public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> BaseCellGenerator<TableWrappedCell<Item>> where Item: BaseItem {
         Item.rddm.tableGenerator(with: model)

Source/Table/TableSection.swift

@@ -23,7 +23,7 @@ public extension TableSection {
 
     static func create(header: HeaderGeneratorType,
                        footer: FooterGeneratorType,
-                       @GeneratorsBuilder<GeneratorType> generators: (TableContext.Type) -> [GeneratorType]) -> Self {
+                       @GeneratorsBuilder<GeneratorType> generators: TableContext.CellsBuilder) -> Self {
         Self(generators: generators(TableContext.self), header: header, footer: footer)
     }