Merge pull request #227 from surfstudio/feature/SPT-1474/view_wrappers_optimisation

Feature/spt 1474/view wrappers optimisation

Author: NullIsOne

Components/Sources/Collection/CollectionWrappedCell+RDDM.swift

@@ -0,0 +1,19 @@
+//
+//  CollectionWrappedCell+RDDM.swift
+//  ReactiveDataDisplayManager
+//
+//  Created by Никита Коробейников on 05.06.2023.
+//
+
+import ReactiveDataDisplayManager
+import UIKit
+
+public extension StaticDataDisplayWrapper where Base: UIView & ConfigurableItem {
+
+    func collectionGenerator(with model: Base.Model,
+                             and registerType: CellRegisterType = .nib) -> BaseCollectionCellGenerator<CollectionWrappedCell<Base>> {
+        CollectionWrappedCell<Base>.rddm.baseGenerator(with: model,
+                                                       and: registerType)
+    }
+
+}

Components/Sources/Collection/CollectionWrappedCell.swift

@@ -17,4 +17,8 @@ public final class CollectionWrappedCell<View: ConfigurableItem>: UICollectionVi
 
     public let nestedView: View = .init(frame: .zero)
 
+    public var cachedInsets: UIEdgeInsets?
+
+    public var cachedAlignment: Alignment?
+
 }

Components/Sources/Common/Models/Alignment.swift

@@ -0,0 +1,20 @@
+//
+//  Alignment.swift
+//  ReactiveDataDisplayManager
+//
+//  Created by Никита Коробейников on 05.06.2023.
+//
+
+import UIKit
+
+/// Alignment of `nestedView` inside `ViewWrapper`
+public enum Alignment: Equatable {
+
+    /// same as `TrailingLessThenOrEqual` and `Equal` for all other constraints
+    case leading(UIEdgeInsets)
+    /// same as `LeadingGreaterThenOrEqual` and `Equal` for all other constraints
+    case trailing(UIEdgeInsets)
+    /// same as `Equal` for all `[top, bottom, leading, trailing]` constraints
+    case all(UIEdgeInsets)
+
+}

Components/Sources/Common/Protocols/AlignmentProvider.swift

@@ -9,6 +9,6 @@ import UIKit
 
 public protocol AlignmentProvider {
 
-    var alignment: NSTextAlignment { get set }
+    var alignment: Alignment { get }
 
 }

Components/Sources/Common/Protocols/InsetsProvider.swift

@@ -12,25 +12,49 @@ public protocol ViewWrapper: ConfigurableItem {
 
     associatedtype NestedView: ConfigurableItem
 
+    /// Inner configurable view with content
     var nestedView: NestedView { get }
 
+    /// Previous value of `Alignment` applyed to `nestedView`
+    var cachedAlignment: Alignment? { get set }
+
 }
 
+// MARK: - Common implementation
+
 public extension ViewWrapper where Self: UIView {
 
     func configure(with model: NestedView.Model) {
-        let insets = (model as? InsetsProvider)?.edgeInsets ?? .zero
-        let alignmentRule = (model as? AlignmentProvider)?.alignment ?? .center
+        wrapNestedViewIfNeeded(with: model)
+        nestedView.configure(with: model)
+    }
+
+}
 
-        switch alignmentRule {
-        case .right:
+// MARK: - Private
+
+private extension ViewWrapper where Self: UIView {
+
+    /// Adding nestedView as subview only if constraint specific parameters were changed
+    func wrapNestedViewIfNeeded(with model: NestedView.Model) {
+        let alignment = (model as? AlignmentProvider)?.alignment
+
+        guard alignment != cachedAlignment else {
+            return
+        }
+
+        nestedView.removeFromSuperview()
+        switch alignment {
+        case .trailing(let insets):
             wrapWithLeadingGreaterThenOrEqualRule(subview: nestedView, with: insets)
-        case .left:
+        case .leading(let insets):
             wrapWithTrailingLessThenOrEqualRule(subview: nestedView, with: insets)
-        default:
+        case .all(let insets):
             wrap(subview: nestedView, with: insets)
+        case .none:
+            break
         }
-        nestedView.configure(with: model)
+        cachedAlignment = alignment
     }
 
 }

Components/Sources/Common/Utils/ViewWrapper.swift

@@ -13,8 +13,7 @@ public class LabelView: UIView {
 
     // MARK: - Private properties
 
-    private var heightConstraint: NSLayoutConstraint?
-    private var textView = UILabel(frame: .zero)
+    private var label: UILabel = .init(frame: .zero)
 
 }
 
@@ -24,7 +23,7 @@ extension LabelView: ConfigurableItem {
 
     // MARK: - Model
 
-    public struct Model: InsetsProvider, AlignmentProvider {
+    public struct Model: AlignmentProvider {
 
         // MARK: - Nested types
 
@@ -63,42 +62,38 @@ extension LabelView: ConfigurableItem {
         public let text: TextType
         public let style: TextStyle
         public let layout: TextLayout
-        public var edgeInsets: UIEdgeInsets
-        public var labelClass: UILabel.Type
-        public var alignment: NSTextAlignment
+        public let alignment: Alignment
+        public let textAlignment: NSTextAlignment
 
         // MARK: - Initialization
 
         public init(text: TextType,
                     style: TextStyle,
                     layout: TextLayout,
-                    alignment: NSTextAlignment,
-                    edgeInsets: UIEdgeInsets,
-                    labelClass: UILabel.Type = UILabel.self) {
+                    textAlignment: NSTextAlignment,
+                    viewAlignment: Alignment = .all(.zero)) {
             self.text = text
             self.style = style
             self.layout = layout
-            self.alignment = alignment
-            self.edgeInsets = edgeInsets
-            self.labelClass = labelClass
+            self.textAlignment = textAlignment
+            self.alignment = viewAlignment
         }
 
     }
 
     // MARK: - Methods
 
     public func configure(with model: Model) {
-        textView = model.labelClass.init()
         configureConstraints()
 
         self.backgroundColor = .clear
-        textView.backgroundColor = .clear
-        textView.textColor = model.style.color
-        textView.font = model.style.font
+        label.backgroundColor = .clear
+        label.textColor = model.style.color
+        label.font = model.style.font
 
-        textView.textAlignment = model.alignment
-        textView.lineBreakMode = model.layout.lineBreakMode
-        textView.numberOfLines = model.layout.numberOfLines
+        label.textAlignment = model.textAlignment
+        label.lineBreakMode = model.layout.lineBreakMode
+        label.numberOfLines = model.layout.numberOfLines
 
         configureText(with: model.text)
 
@@ -112,27 +107,16 @@ extension LabelView: ConfigurableItem {
 private extension LabelView {
 
     func configureConstraints() {
-        wrap(subview: textView, with: .zero)
+        wrap(subview: label, with: .zero)
     }
 
     func configureText(with text: Model.TextType) {
         switch text {
         case .string(let text):
-            textView.text = text
+            label.text = text
         case .attributedString(let attrubutedText):
-            textView.attributedText = attrubutedText
+            label.attributedText = attrubutedText
         }
     }
 
 }
-
-// MARK: - LabelView.Model Equatable
-
-extension LabelView.Model: Equatable {
-
-    public static func == (lhs: LabelView.Model, rhs: LabelView.Model) -> Bool {
-        return lhs.style == rhs.style && lhs.layout == rhs.layout && lhs.text == rhs.text &&
-        lhs.edgeInsets == rhs.edgeInsets && lhs.labelClass == rhs.labelClass
-    }
-
-}

Components/Sources/Common/Views/LabelView.swift

@@ -23,7 +23,7 @@ extension MessageView: ConfigurableItem {
 
     // MARK: - Model
 
-    public struct Model: Equatable, InsetsProvider, AlignmentProvider {
+    public struct Model: Equatable, AlignmentProvider {
 
         // MARK: - Nested types
 
@@ -70,23 +70,23 @@ extension MessageView: ConfigurableItem {
 
         public let text: TextType
         public let style: MessageStyle
-        public var alignment: NSTextAlignment
-        public var edgeInsets: UIEdgeInsets
+        public var textAlignment: NSTextAlignment
+        public var alignment: Alignment
         public let internalEdgeInsets: UIEdgeInsets
         public let borderStyle: BorderStyle
 
         // MARK: - Initialization
 
         public init(text: TextType,
                     style: MessageStyle,
-                    alignment: NSTextAlignment,
-                    externalEdgeInsets: UIEdgeInsets,
+                    textAlignment: NSTextAlignment,
+                    viewAlignment: Alignment,
                     internalEdgeInsets: UIEdgeInsets,
                     borderStyle: BorderStyle) {
             self.text = text
             self.style = style
-            self.alignment = alignment
-            self.edgeInsets = externalEdgeInsets
+            self.textAlignment = textAlignment
+            self.alignment = viewAlignment
             self.internalEdgeInsets = internalEdgeInsets
             self.borderStyle = borderStyle
         }
@@ -104,7 +104,7 @@ extension MessageView: ConfigurableItem {
         configureTextView(textView, with: model)
         textView.textColor = model.style.textColor
         textView.font = model.style.font
-        textView.textAlignment = model.alignment
+        textView.textAlignment = model.textAlignment
 
         wrap(subview: textView, with: model.internalEdgeInsets)
 

Components/Sources/Common/Views/MessageView.swift

@@ -33,7 +33,7 @@ public class SeparatorView: UIView {
 
 extension SeparatorView: ConfigurableItem {
 
-    public struct Model: Equatable, InsetsProvider {
+    public struct Model: Equatable {
         public let height: CGFloat
         public let color: UIColor?
         public var edgeInsets: UIEdgeInsets

Components/Sources/Common/Views/SeparatorView.swift

@@ -0,0 +1,19 @@
+//
+//  TableWrappedCell+RDDM.swift
+//  ReactiveDataDisplayManager
+//
+//  Created by Никита Коробейников on 05.06.2023.
+//
+
+import ReactiveDataDisplayManager
+import UIKit
+
+public extension StaticDataDisplayWrapper where Base: UIView & ConfigurableItem {
+
+    func tableGenerator(with model: Base.Model,
+                        and registerType: CellRegisterType = .nib) -> BaseCellGenerator<TableWrappedCell<Base>> {
+        TableWrappedCell<Base>.rddm.baseGenerator(with: model,
+                                                  and: registerType)
+    }
+
+}