Update AmityUIKit v4.18.0

- Support Xcode 26.4

Author: ZayYarHtun

UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/replyArrowIcon.imageset/replyArrowIcon.svg

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_tag.svg",
+      "filename" : "ic_product_tag.svg",
       "idiom" : "universal"
     }
   ],

UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/tagIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "viewMoreReplyArrowIcon.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/tagIcon.imageset/ic_product_tag.svg

@@ -44,6 +44,10 @@ extension AmityMessageTextEditorView: AmityViewBuildable {
     public func scrollEnabled(_ value: Bool) -> Self {
         mutating(keyPath: \.scrollEnabled, value: value)
     }
+    
+    public func displayInlineSuggestionView(_ value: Bool) -> Self {
+        mutating(keyPath: \.displayInlineSuggestionView, value: value)
+    }
 }
 
 public struct AmityMessageTextEditorView: View {
@@ -70,6 +74,7 @@ public struct AmityMessageTextEditorView: View {
     private var maxHashtagCount: Int = 5
     private var enableProductMention: Bool = false
     private var scrollEnabled: Bool = true
+    private var displayInlineSuggestionView: Bool = true
 
     public init(_ viewModel: AmityTextEditorViewModel, text: Binding<String>, mentionData: Binding<MentionData>, mentionedUsers: Binding<[AmityMentionUserModel]>, links: Binding<[LinkDetail]?>? = nil, textViewHeight: CGFloat, textEditorMaxHeight: CGFloat = 106, placeholderPadding: CGFloat = 5) {
         self._text = text
@@ -185,14 +190,16 @@ public struct AmityMessageTextEditorView: View {
             }
         }
         .onChange(of: viewModel.showSuggestionView) { show in
-            if show {
-                showSuggestionOverlay()
-            } else {
-                SuggestionOverlayWindow.dismiss()
+            if displayInlineSuggestionView {
+                if show {
+                    showSuggestionOverlay()
+                } else {
+                    SuggestionOverlayWindow.dismiss()
+                }
             }
         }
         .onChange(of: viewModel.suggestionViewCursorRect) { newRect in
-            if viewModel.showSuggestionView {
+            if viewModel.showSuggestionView && displayInlineSuggestionView {
                 SuggestionOverlayWindow.updatePosition(at: newRect)
             }
         }

UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/tagIcon.imageset/ic_tag.svg

@@ -425,7 +425,7 @@ extension ClipFeedItemOverlayView {
     private var postExpandableContent: some View {
         ExpandableText(post.text, defaultAction: {
             togglePostContentExpantion()
-        }, metadata: post.metadata, mentionees: post.mentionees, onTapMentionee: { userId in
+        }, metadata: post.metadata, mentionees: post.mentionees, links: post.links, onTapMentionee: { userId in
             // We do not support expanding text in this view, so we redirect to post detail page
             onTapAction?(.userProfile(userId: userId))
         })

UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/viewMoreReplyArrowIcon.imageset/Contents.json

@@ -52,6 +52,10 @@ extension AmityTextEditorView: AmityViewBuildable {
     public func hightlightColor(_ value: UIColor) -> Self {
         mutating(keyPath: \.hightlightColor, value: value)
     }
+    
+    public func enableLinkHighlight(_ value: Bool) -> Self {
+        mutating(keyPath: \.enableLinkHighlight, value: value)
+    }
 }
 
 
@@ -90,12 +94,16 @@ public struct AmityTextEditorView: View {
     private var backgroundColor: UIColor = .white
 
     private var hightlightColor: UIColor = .blue
+    private var enableLinkHighlight: Bool = false
 
     public init(_ mentionManagerType: MentionManagerType, text: Binding<String>, mentionData: Binding<MentionData>, textViewHeight: CGFloat) {
         self._text = text
         self._mentionData = mentionData
         self._textEditorHeight = State(initialValue: textViewHeight)
         self.textEditorMinHeight = textViewHeight
+        // Hide the placeholder immediately when the view is created with pre-existing text
+        // (e.g. after a mention prefill triggers a .id()-based view recreation).
+        self._hidePlaceholder = State(initialValue: !text.wrappedValue.isEmpty)
 
         let mentionManger = MentionManager(withType: mentionManagerType)
 
@@ -109,12 +117,28 @@ public struct AmityTextEditorView: View {
                     .onAppear {
                         textEditorInitialHeight = geometry.size.height
 
+                        if let metadata = mentionData.metadata {
+                            viewModel.mentionManager.setMentions(metadata: metadata, inText: text)
+                        }
+                        
+                        if enableLinkHighlight {
+                            applyLinkHighlight(to: viewModel.textView)
+                        }
+                        
                         if autoFocusTextEditor {
-                            viewModel.textView.becomeFirstResponder()
+                            DispatchQueue.main.async {
+                                viewModel.textView.becomeFirstResponder()
+                                let endPosition = viewModel.textView.endOfDocument
+                                viewModel.textView.selectedTextRange = viewModel.textView.textRange(from: endPosition, to: endPosition)
+                            }
                         }
 
-                        if let metadata = mentionData.metadata {
-                            viewModel.mentionManager.setMentions(metadata: metadata, inText: text)
+                        viewModel.didFinishMentionHighlight = {
+                            DispatchQueue.main.async {
+                                if enableLinkHighlight {
+                                    self.applyLinkHighlight(to: self.viewModel.textView)
+                                }
+                            }
                         }
                     }
                     .onChange(of: text) { value in
@@ -128,11 +152,19 @@ public struct AmityTextEditorView: View {
 
                         let paddedHeight = textHeight + defaultInset.top + defaultInset.bottom
                         textEditorHeight = max(textEditorMinHeight, min(paddedHeight, textEditorMaxHeight))
+                        
+                        if enableLinkHighlight {
+                            applyLinkHighlight(to: viewModel.textView)
+                        }
                     }
                     .onReceive(viewModel.textView.textPublisher, perform: { text in
                         self.mentionData.metadata = viewModel.mentionManager.getMetadata()
                         self.mentionData.mentionee = viewModel.mentionManager.getMentionees()
                         self.text = text
+                        
+                        if enableLinkHighlight {
+                            applyLinkHighlight(to: viewModel.textView)
+                        }
                     })
                     .onChange(of: mentionedUsers.count) { count in
                         let listHeight = mentionedUsers.count < 5 ? CGFloat(mentionedUsers.count) * 50.0 : 250.0
@@ -202,6 +234,10 @@ public struct AmityTextEditorView: View {
         }
         .onReceive(viewConfig.$theme) { value in
             viewModel.updateAttributes(hightlightColor: value.primaryColor, textColor: value.baseColor)
+            
+            if enableLinkHighlight {
+                applyLinkHighlight(to: viewModel.textView)
+            }
         }
         .frame(height: textEditorHeight)
     }
@@ -217,6 +253,33 @@ public struct AmityTextEditorView: View {
             0.0
         }
     }
+    
+    private func applyLinkHighlight(to textView: UITextView) {
+        guard let attributedText = textView.attributedText?.mutableCopy() as? NSMutableAttributedString else { return }
+        
+        let selectedRange = textView.selectedRange
+        let text = attributedText.string
+        let fullRange = NSRange(location: 0, length: text.utf16.count)
+        let extractedLinks = viewModel.linkManager.extractLinks(from: text)
+        
+        // Remove existing link highlights
+        attributedText.enumerateAttributes(in: fullRange) { attribute, range, _ in
+            if attribute[.link] as? Bool == true {
+                attributedText.removeAttribute(.foregroundColor, range: range)
+                attributedText.removeAttribute(.link, range: range)
+            }
+        }
+        
+        // Apply new link highlights
+        for link in extractedLinks {
+            attributedText.addAttribute(.foregroundColor, value: viewModel.highlightAttributes[.foregroundColor] ?? UIColor(), range: link.range)
+            attributedText.addAttribute(.link, value: true, range: link.range)
+        }
+        
+        textView.attributedText = attributedText
+        textView.selectedRange = selectedRange
+        textView.typingAttributes = viewModel.typingAttributes
+    }
 }
 
 // MARK: - AmityTextEditorViewModel

UpstraUIKit/AmityUIKit4/AmityUIKit4/Assets.xcassets/viewMoreReplyArrowIcon.imageset/viewMoreReplyArrowIcon.svg

@@ -7,6 +7,7 @@
 
 import Foundation
 import SwiftUI
+import SafariServices
 import AmitySDK
 
 /**
@@ -58,13 +59,14 @@ public struct ExpandableText: View {
     internal var onTapProductTag: ((String) -> Void)?
     internal var defaultAction: (() -> Void)?
     internal var highlights: String?
+    internal var links: [AmityLink] = []
 
     /**
      Initializes a new `ExpandableText` instance with the specified text string, trimmed of any leading or trailing whitespace and newline characters.
      - Parameter text: The initial text string to display in the `ExpandableText` view.
      - Returns: A new `ExpandableText` instance with the specified text string and trimming applied.
      */
-    public init(_ text: String, defaultAction: (() -> Void)? = nil, metadata: [String: Any]? = nil, mentionees: [AmityMentionees]? = nil, productTags: [AmityProductTagModel]? = [], highlightedText: String? = nil, onTapMentionee: ((String) -> Void)? = nil, onTapHashtag: ((String) -> Void)? = nil, onTapProductTag: ((String) -> Void)? = nil) {
+    public init(_ text: String, defaultAction: (() -> Void)? = nil, metadata: [String: Any]? = nil, mentionees: [AmityMentionees]? = nil, productTags: [AmityProductTagModel]? = [], highlightedText: String? = nil, links: [AmityLink] = [], onTapMentionee: ((String) -> Void)? = nil, onTapHashtag: ((String) -> Void)? = nil, onTapProductTag: ((String) -> Void)? = nil) {
         self.text = text.trimmingCharacters(in: .newlines)
         self.defaultAction = defaultAction
         self.metadata = metadata
@@ -74,6 +76,7 @@ public struct ExpandableText: View {
         self.onTapHashtag = onTapHashtag
         self.onTapProductTag = onTapProductTag
         self.highlights = highlightedText
+        self.links = links
     }
 
     public var body: some View {
@@ -131,8 +134,8 @@ public struct ExpandableText: View {
     @ViewBuilder
     private var content: some View {
         if #available(iOS 15, *) {
-            let trimmedText = getAttributedText(text: textTrimmingDoubleNewlines, metadata: metadata ?? [:], mentionees: mentionees ?? [], productTags: productTags ?? [], font: .systemFont(ofSize: 14, weight: .bold), attributedColor: attributedColor, hashtagColor: hashtagColor, highlights: highlights, color: color)
-            let text = getAttributedText(text: text, metadata: metadata ?? [:], mentionees: mentionees ?? [], productTags: productTags ?? [], font: .systemFont(ofSize: 14, weight: .bold), attributedColor: attributedColor, hashtagColor: hashtagColor, highlights: highlights, color: color)
+            let trimmedText = getAttributedText(text: textTrimmingDoubleNewlines, metadata: metadata ?? [:], mentionees: mentionees ?? [], productTags: productTags ?? [], font: .systemFont(ofSize: 14, weight: .bold), attributedColor: attributedColor, hashtagColor: hashtagColor, highlights: highlights, color: color, links: links)
+            let text = getAttributedText(text: text, metadata: metadata ?? [:], mentionees: mentionees ?? [], productTags: productTags ?? [], font: .systemFont(ofSize: 14, weight: .bold), attributedColor: attributedColor, hashtagColor: hashtagColor, highlights: highlights, color: color, links: links)
 
             Text(trimMultipleNewlinesWhenTruncated
                  ? (shouldShowMoreButton ? trimmedText : text)
@@ -160,7 +163,11 @@ public struct ExpandableText: View {
                     return .discarded
                 }
 
-                return .systemAction
+                // Open link in in-app browser
+                let browserVC = SFSafariViewController(url: url)
+                browserVC.modalPresentationStyle = .pageSheet
+                UIApplication.topViewController()?.present(browserVC, animated: true)
+                return .discarded
             })
         } else {
             Text(.init(
@@ -187,7 +194,7 @@ public struct ExpandableText: View {
 
 extension ExpandableText {
     @available(iOS 15, *)
-    private func getAttributedText(text: String, metadata: [String: Any], mentionees: [AmityMentionees], productTags: [AmityProductTagModel], font: UIFont, attributedColor: UIColor, hashtagColor: UIColor, highlights: String?, color: Color) -> AttributedString {
+    private func getAttributedText(text: String, metadata: [String: Any], mentionees: [AmityMentionees], productTags: [AmityProductTagModel], font: UIFont, attributedColor: UIColor, hashtagColor: UIColor, highlights: String?, color: Color, links: [AmityLink] = []) -> AttributedString {
 
         let highlightAttributes: [NSAttributedString.Key: Any] = [.foregroundColor: attributedColor, .font: AmityTextStyle.bodyBold(.clear).getFont()]
 
@@ -207,9 +214,27 @@ extension ExpandableText {
         highlightedText = AttributedString(attributedString)
 
         // If links is present, highlight links
-        let links = TextHighlighter.detectLinks(in: contentText)
-        if !links.isEmpty {
-            highlightedText = TextHighlighter.highlightLinks(links: links, in: highlightedText, attributes: highlightAttributes)
+        var detectedLinks = TextHighlighter.detectLinks(in: contentText)
+        
+        // Build a mapping from displayed link text -> actual URL from post.links
+        var linkURLMap: [String: String] = [:]
+        let nsText = contentText as NSString
+        for link in links {
+            if let index = link.index, let length = link.length,
+               index >= 0, length > 0,
+               index + length <= nsText.length {
+                let linkText = nsText.substring(with: NSRange(location: index, length: length))
+                linkURLMap[linkText] = link.url
+                if !detectedLinks.contains(linkText) {
+                    detectedLinks.append(linkText)
+                }
+            } else if !detectedLinks.contains(link.url) {
+                detectedLinks.append(link.url)
+            }
+        }
+        
+        if !detectedLinks.isEmpty {
+            highlightedText = TextHighlighter.highlightLinks(links: detectedLinks, in: highlightedText, attributes: highlightAttributes, linkURLMap: linkURLMap)
         }
 
         // If the text need to highlight is a hashtag search keyword