VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift

@@ -121,55 +121,39 @@ open class TextLinkCaret: ButtonBase {
 
         let space: CGFloat = VDSLayout.Spacing.space1X.value // Space between the icon and the text
         
-        var titleLabelX: CGFloat = bounds.minX + contentEdgeInsets.left
-
         // Adjust icon and text positions based on the iconPosition
         switch iconPosition {
         case .left:
-            
+            imageView.frame.origin.x = bounds.minX + contentEdgeInsets.left
-            let imageSpaceWidth = imageSize.width + space
+            imageView.frame.origin.y = titleLabel.frame.minY + (textStyle.lineHeight - imageSize.height) / 2.0
-            let titleWidth = titleLabel.frame.width
+            titleLabel.frame.origin.x = imageView.frame.maxX + space
-            
-            switch contentHorizontalAlignment {
-            case .center:
-                titleLabelX = (frame.width - titleWidth) / 2
-            case .right, .trailing:
-                titleLabelX = frame.width - titleWidth
-            default:
-                titleLabelX = imageSpaceWidth
-            }
-            titleLabel.frame.origin.x = titleLabelX
-            imageView.frame.origin.x = titleLabelX - imageSpaceWidth
-            imageView.frame.origin.y = titleLabel.frame.minY + 10 / 2.0
             
         case .right:
-            
+
             guard let attribtedText = titleLabel.attributedText else { return }
-            
+
-            titleLabel.frame.origin.x = titleLabelX
-            
             let textContainer = NSTextContainer(size: CGSize(width: titleLabel.bounds.width, height: CGFloat.greatestFiniteMagnitude))
             textContainer.lineFragmentPadding = 0
-            
+
             let layoutManager = NSLayoutManager()
             layoutManager.addTextContainer(textContainer)
-            
+
             let textStorage = NSTextStorage(attributedString: attribtedText)
             textStorage.addLayoutManager(layoutManager)
-            
+
             let lastGlyphIndex = layoutManager.glyphIndexForCharacter(at: attribtedText.string.utf16.count - 1)
             var lastGlyphRect = layoutManager.boundingRect(forGlyphRange: NSRange(location: lastGlyphIndex, length: 1), in: textContainer)
-            
+
             lastGlyphRect.origin.x += titleLabel.frame.origin.x
             lastGlyphRect.origin.y += titleLabel.frame.origin.y
-            
+
             imageView.frame.origin.x = lastGlyphRect.maxX + space
             imageView.frame.origin.y = lastGlyphRect.midY - imageSize.height / 2
+
         }
-    
+        
         imageView.contentMode = .scaleAspectFit
+        
     }
-    
-    
 }