[TextField#278] Make leftView and rightView scalable

adevinta · Nov 6, 2023 · b169d8e · b169d8e
1 parent a5846c7
commit b169d8e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/core/Sources/Components/TextField/StandaloneTextField/UIKit/TextFieldUIView.swift b/core/Sources/Components/TextField/StandaloneTextField/UIKit/TextFieldUIView.swift
@@ -44,6 +44,8 @@ public final class TextFieldUIView: UITextField {
     }
 
     @ScaledUIMetric private var height: CGFloat = 44
+    @ScaledUIMetric private var leftViewSize: CGFloat = .zero
+    @ScaledUIMetric private var rightViewSize: CGFloat = .zero
 
     // MARK: - Initializers
 
@@ -139,13 +141,21 @@ public final class TextFieldUIView: UITextField {
 
     public override func rightViewRect(forBounds bounds: CGRect) -> CGRect {
         var rect = super.rightViewRect(forBounds: bounds)
-        rect.origin.x -= self.viewModel.spacings.right
+        self.rightViewSize = rect.width
+        rect.origin.x = (rect.maxX - self.viewModel.spacings.right - self.rightViewSize)
+        rect.origin.y = bounds.size.height / 2 - self.rightViewSize / 2
+        rect.size.width = self.rightViewSize
+        rect.size.height = self.rightViewSize
         return rect
     }
 
     public override func leftViewRect(forBounds bounds: CGRect) -> CGRect {
         var rect = super.leftViewRect(forBounds: bounds)
+        self.leftViewSize = rect.width
         rect.origin.x += self.viewModel.spacings.left
+        rect.origin.y = bounds.size.height / 2 - self.leftViewSize / 2
+        rect.size.width = self.leftViewSize
+        rect.size.height = self.leftViewSize
         return rect
     }
 

diff --git a/spark/Demo/Classes/View/Components/TextField/UIKit/TextFieldComponentUIView.swift b/spark/Demo/Classes/View/Components/TextField/UIKit/TextFieldComponentUIView.swift
@@ -296,7 +296,7 @@ final class TextFieldComponentUIView: UIView {
         self.vStack.addArrangedSubview(self.leftViewModeStackView)
         self.vStack.addArrangedSubview(self.clearButtonModeStackView)
         self.vStack.addArrangedSubview(self.standaloneTextFieldLabel)
-//        self.vStack.addArrangedSubview(self.textField)
+        self.vStack.addArrangedSubview(self.textField)
         self.vStack.addArrangedSubview(self.addOnTextFieldLabel)
         self.vStack.addArrangedSubview(self.addOnTextField)