VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift

@@ -51,9 +51,7 @@ open class TextLinkCaret: ButtonBase {
         $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
     }
     
-    private var imageAttribute: CaretLabelAttribute? {
-        iconPosition == .right ? CaretLabelAttribute(tintColor: textColor, position: iconPosition) : nil
-    }
+    private var imageAttribute: CaretLabelAttribute?
     
     //--------------------------------------------------
     // MARK: - Public Properties
@@ -82,13 +80,11 @@ open class TextLinkCaret: ButtonBase {
     open override func setup() {
         super.setup()
         accessibilityTraits = .link
-        titleLabel?.numberOfLines = 0
     }
     
     /// Used to make changes to the View based off a change events or from local properties.
     open override func updateView() {
-        setImage(iconPosition == .right ? nil : BundleManager.shared.image(for: Icon.Name.leftCaretBold.rawValue), for: .normal)
-        imageEdgeInsets = iconPosition == .right ? .zero : .init(top: 0, left: -spacing, bottom: 0, right: 0)
+        imageAttribute = CaretLabelAttribute(tintColor: textColor, position: iconPosition)
         super.updateView()
     }
     
@@ -102,80 +98,8 @@ open class TextLinkCaret: ButtonBase {
     /// The natural size for the receiving view, considering only properties of the view itself.
     override open var intrinsicContentSize: CGSize {
         //get the labels size, if not the button
-        if iconPosition == .right {
-            return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize
-        } else {
-            let width = imageSize.width + spacing + (titleLabel?.intrinsicContentSize.width ?? super.intrinsicContentSize.width)
-            let height = titleLabel?.intrinsicContentSize.height ?? super.intrinsicContentSize.height
-            return .init(width: width, height: height)
-        }
+        return titleLabel?.intrinsicContentSize ?? super.intrinsicContentSize
     }
-    private let imageSize = Icon.Size.xsmall.dimensions
-    private let spacing = 4.0
-
-//    private var activeConstraints: [NSLayoutConstraint] = []
-//    
-//    private func setupConstraints() {
-//        guard let titleLabel else { return }
-//        titleLabel.translatesAutoresizingMaskIntoConstraints = false
-//        
-//        NSLayoutConstraint.deactivate(activeConstraints)
-//        activeConstraints.removeAll()
-//        
-//        if let caret = BundleManager.shared.image(for: Icon.Name.leftCaretBold.rawValue), iconPosition == .left{
-//            setImage(caret, for: .normal)
-//            guard let imageView else { return }
-//            imageView.removeConstraints(imageView.constraints)
-//            imageView.translatesAutoresizingMaskIntoConstraints = false
-//            
-//            activeConstraints = [
-//                imageView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
-//                imageView.topAnchor.constraint(equalTo: titleLabel.topAnchor, constant: 5),
-//                imageView.widthAnchor.constraint(equalToConstant: imageSize.width),
-//                imageView.heightAnchor.constraint(equalToConstant: imageSize.height),
-//                titleLabel.leadingAnchor.constraint(equalTo: imageView.trailingAnchor),
-//                titleLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor),
-//                titleLabel.topAnchor.constraint(equalTo: self.topAnchor),
-//                titleLabel.bottomAnchor.constraint(equalTo: self.bottomAnchor)
-//            ]
-//            
-//        } else {
-//            
-//            setImage(nil, for: .normal)
-//            activeConstraints = [
-//                titleLabel.topAnchor.constraint(equalTo: self.topAnchor),
-//                titleLabel.bottomAnchor.constraint(equalTo: self.bottomAnchor),
-//                titleLabel.leadingAnchor.constraint(equalTo: self.leadingAnchor),
-//                titleLabel.trailingAnchor.constraint(equalTo: self.trailingAnchor)
-//            ]
-//        }
-//        
-//        NSLayoutConstraint.activate(activeConstraints)
-//    }
-    
-    open override func layoutSubviews() {
-        super.layoutSubviews()
-        imageView?.frame.size = imageSize
-        imageView?.frame.origin = .init(x: 0, y: spacing)
-    }
-//    open override func layoutSubviews() {
-//        super.layoutSubviews()
-//        
-//        guard let imageView, let titleLabel else { return }
-//        
-//        if imageView.isHidden {
-//            titleLabel.frame.origin.x = 0
-//            contentEdgeInsets = .zero
-//        } else {
-//            imageView.frame.origin.x = 0
-//            titleLabel.frame.origin.x = imageSize.width + spacing
-//            
-//            let totalWidth = titleLabel.frame.maxX
-//            let leftInset = (bounds.width - totalWidth) / 2            
-//           contentEdgeInsets = .init(top: 0, left: leftInset, bottom: 0, right: leftInset)
-//        }
-//    }
-    
 }
 
 extension TextLinkCaret {
@@ -203,6 +127,9 @@ extension TextLinkCaret {
             if position == .right {
                 attributedString.append(spacer)
                 attributedString.append(NSAttributedString(attachment: image))
+            } else {
+                attributedString.insert(NSAttributedString(attachment: image), at: 0)
+                attributedString.insert(spacer, at: 1)
             }
         }