improve UKButton

Author: VislovIvan

Examples/DemosApp/DemosApp/ComponentsPreview/PreviewPages/ButtonPreview.swift

@@ -23,7 +23,9 @@ struct ButtonPreview: View {
           Text("Custom: 20px").tag(ComponentRadius.custom(20))
         }
         ButtonFontPicker(selection: self.$model.font)
-        Toggle("Enabled", isOn: self.$model.isEnabled)
+        if !self.model.isLoading {
+          Toggle("Enabled", isOn: self.$model.isEnabled)
+        }
         Toggle("Full Width", isOn: self.$model.isFullWidth)
         Picker("Image Source", selection: self.$model.imageSrc) {
           Text("SF Symbol").tag(ButtonVM.ImageSource.sfSymbol("camera.fill"))

Sources/ComponentsKit/Components/Button/Models/ButtonVM.swift

@@ -74,6 +74,10 @@ public struct ButtonVM: ComponentVM {
 // MARK: Shared Helpers
 
 extension ButtonVM {
+  private var isInteractive: Bool {
+    self.isEnabled && !self.isLoading
+  }
+
   var preferredLoadingVM: LoadingVM {
     return self.loadingVM ?? .init {
       $0.color = .init(
@@ -87,10 +91,10 @@ extension ButtonVM {
     switch self.style {
     case .filled:
       let color = self.color?.main ?? .content2
-      return color.enabled(self.isEnabled)
+      return color.enabled(self.isInteractive)
     case .light:
       let color = self.color?.background ?? .content1
-      return color.enabled(self.isEnabled)
+      return color.enabled(self.isInteractive)
     case .plain, .bordered:
       return nil
     }
@@ -102,7 +106,7 @@ extension ButtonVM {
     case .plain, .light, .bordered:
       self.color?.main ?? .foreground
     }
-    return color.enabled(self.isEnabled)
+    return color.enabled(self.isInteractive)
   }
   var borderWidth: CGFloat {
     switch self.style {
@@ -118,7 +122,7 @@ extension ButtonVM {
       return nil
     case .bordered:
       if let color {
-        return color.main.enabled(self.isEnabled)
+        return color.main.enabled(self.isInteractive)
       } else {
         return .divider
       }
@@ -193,6 +197,18 @@ extension ButtonVM {
   }
 }
 
+extension ButtonVM {
+  public var uiImage: UIImage? {
+    guard let imageSrc = self.imageSrc else { return nil }
+    switch imageSrc {
+    case .sfSymbol(let name):
+      return UIImage(systemName: name)?.withRenderingMode(.alwaysTemplate)
+    case .local(let name, let bundle):
+      return UIImage(named: name, in: bundle, compatibleWith: nil)?.withRenderingMode(.alwaysTemplate)
+    }
+  }
+}
+
 // MARK: SwiftUI Helpers
 
 extension ButtonVM {
@@ -206,9 +222,9 @@ extension ButtonVM {
     guard let imageSrc = self.imageSrc else { return nil }
     switch imageSrc {
     case .sfSymbol(let name):
-      return Image(systemName: name)
+      return Image(systemName: name).renderingMode(.template)
     case .local(let name, let bundle):
-      return Image(name, bundle: bundle)
+      return Image(name, bundle: bundle).renderingMode(.template)
     }
   }
 }

Sources/ComponentsKit/Components/Button/UKButton.swift

@@ -32,6 +32,15 @@ open class UKButton: UIView, UKComponent {
   /// A label that displays the title from the model.
   public var titleLabel = UILabel()
 
+  /// A loader view, created with the preferred loading VM from the model.
+  public let loaderView: UKLoading
+
+  /// A stack view that arranges the loader and title label.
+  private let stackView = UIStackView()
+
+  /// A image view for displaying the image from the model.
+  public let imageView: UIImageView = UIImageView()
+
   // MARK: UIView Properties
 
   open override var intrinsicContentSize: CGSize {
@@ -50,6 +59,7 @@ open class UKButton: UIView, UKComponent {
   ) {
     self.model = model
     self.action = action
+    self.loaderView = UKLoading(model: model.preferredLoadingVM)
     super.init(frame: .zero)
 
     self.setup()
@@ -64,7 +74,7 @@ open class UKButton: UIView, UKComponent {
   // MARK: Setup
 
   private func setup() {
-    self.addSubview(self.titleLabel)
+    self.addSubview(self.stackView)
 
     if #available(iOS 17.0, *) {
       self.registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (view: Self, _: UITraitCollection) in
@@ -78,12 +88,23 @@ open class UKButton: UIView, UKComponent {
   private func style() {
     Self.Style.mainView(self, model: self.model)
     Self.Style.titleLabel(self.titleLabel, model: self.model)
+    Self.Style.configureStackView(
+      self.stackView,
+      model: self.model,
+      loaderView: self.loaderView,
+      titleLabel: self.titleLabel,
+      imageView: self.imageView
+    )
+
+    self.loaderView.model = self.model.preferredLoadingVM
+
+    self.loaderView.isHidden = !self.model.isLoading
   }
 
   // MARK: Layout
 
   private func layout() {
-    self.titleLabel.center()
+    self.stackView.center()
   }
 
   open override func layoutSubviews() {
@@ -99,15 +120,21 @@ open class UKButton: UIView, UKComponent {
 
     self.style()
 
-    if self.model.shouldUpdateSize(oldModel) {
+    self.imageView.image = self.model.uiImage
+    self.imageView.tintColor = self.model.foregroundColor.uiColor
+
+    if self.model.shouldUpdateSize(oldModel)
+        || self.model.isLoading != oldModel.isLoading
+        || self.model.imageSrc != oldModel.imageSrc
+        || self.model.imageLocation != oldModel.imageLocation {
       self.invalidateIntrinsicContentSize()
     }
   }
 
   // MARK: UIView methods
 
   open override func sizeThatFits(_ size: CGSize) -> CGSize {
-    let contentSize = self.titleLabel.sizeThatFits(size)
+    let contentSize = self.stackView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
     let preferredSize = self.model.preferredSize(
       for: contentSize,
       parentWidth: self.superview?.bounds.width
@@ -183,5 +210,40 @@ extension UKButton {
       label.font = model.preferredFont.uiFont
       label.textColor = model.foregroundColor.uiColor
     }
+    static func configureStackView(
+      _ stackView: UIStackView,
+      model: Model,
+      loaderView: UKLoading,
+      titleLabel: UILabel,
+      imageView: UIImageView
+    ) {
+      stackView.axis = .horizontal
+      stackView.alignment = .center
+      stackView.spacing = model.contentSpacing
+
+      for subview in stackView.arrangedSubviews {
+        stackView.removeArrangedSubview(subview)
+        subview.removeFromSuperview()
+      }
+
+      if model.isLoading {
+        stackView.addArrangedSubview(loaderView)
+        stackView.addArrangedSubview(titleLabel)
+        return
+      }
+
+      if let _ = model.imageSrc {
+        switch model.imageLocation {
+        case .leading:
+          stackView.addArrangedSubview(imageView)
+          stackView.addArrangedSubview(titleLabel)
+        case .trailing:
+          stackView.addArrangedSubview(titleLabel)
+          stackView.addArrangedSubview(imageView)
+        }
+      } else {
+        stackView.addArrangedSubview(titleLabel)
+      }
+    }
   }
 }