Move quotedMessage inside the QuotedMessageContentViewOptions

Author: nuno-vieira

Sources/StreamChatSwiftUI/ChatChannel/MessageList/QuotedMessageView.swift

@@ -110,9 +110,10 @@ public struct QuotedMessageView<Factory: ViewFactory>: View {
     public var body: some View {
         HStack(alignment: .top) {
             factory.makeQuotedMessageContentView(
-                quotedMessage: quotedMessage,
                 options: QuotedMessageContentViewOptions(
+                    quotedMessage: quotedMessage,
                     fillAvailableSpace: fillAvailableSpace,
+                    forceLeftToRight: forceLeftToRight,
                     attachmentSize: attachmentSize
                 )
             )
@@ -153,16 +154,24 @@ public struct QuotedMessageView<Factory: ViewFactory>: View {
 
 /// Options for configuring the quoted message content view.
 public struct QuotedMessageContentViewOptions {
+    /// The quoted message to display.
+    public let quotedMessage: ChatMessage
     /// Whether the quoted container should take all the available space.
     public let fillAvailableSpace: Bool
+    /// Whether to force left to right layout.
+    public let forceLeftToRight: Bool
     /// The size of the attachment preview.
     public let attachmentSize: CGSize
 
     public init(
+        quotedMessage: ChatMessage,
         fillAvailableSpace: Bool,
+        forceLeftToRight: Bool,
         attachmentSize: CGSize = CGSize(width: 36, height: 36)
     ) {
+        self.quotedMessage = quotedMessage
         self.fillAvailableSpace = fillAvailableSpace
+        self.forceLeftToRight = forceLeftToRight
         self.attachmentSize = attachmentSize
     }
 }
@@ -179,20 +188,21 @@ public struct QuotedMessageContentView<Factory: ViewFactory>: View {
     @Injected(\.utils) private var utils
 
     public var factory: Factory
-    public var quotedMessage: ChatMessage
     public var options: QuotedMessageContentViewOptions
+    
+    private var quotedMessage: ChatMessage {
+        options.quotedMessage
+    }
 
     private var messageTypeResolver: MessageTypeResolving {
         utils.messageTypeResolver
     }
 
     public init(
         factory: Factory,
-        quotedMessage: ChatMessage,
         options: QuotedMessageContentViewOptions
     ) {
         self.factory = factory
-        self.quotedMessage = quotedMessage
         self.options = options
     }
 

Sources/StreamChatSwiftUI/DefaultViewFactory.swift

@@ -999,12 +999,10 @@ extension ViewFactory {
     }
 
     public func makeQuotedMessageContentView(
-        quotedMessage: ChatMessage,
         options: QuotedMessageContentViewOptions
     ) -> some View {
         QuotedMessageContentView(
             factory: self,
-            quotedMessage: quotedMessage,
             options: options
         )
     }

Sources/StreamChatSwiftUI/ViewFactory.swift

@@ -1021,11 +1021,9 @@ public protocol ViewFactory: AnyObject {
     /// It is the view that is embedded in quoted message bubble view.
     ///
     /// - Parameters:
-    ///  - quotedMessage: the quoted message.
     ///  - options: configuration options for the quoted message content view.
     /// - Returns: view displayed in the quoted message content slot.
     func makeQuotedMessageContentView(
-        quotedMessage: ChatMessage,
         options: QuotedMessageContentViewOptions
     ) -> QuotedMessageContentViewType
 

StreamChatSwiftUITests/Tests/ChatChannel/QuotedMessageView_Tests.swift

@@ -272,11 +272,10 @@ private class CustomQuotedContentViewFactory: ViewFactory {
     static let shared = CustomQuotedContentViewFactory()
 
     func makeQuotedMessageContentView(
-        quotedMessage: ChatMessage,
         options: QuotedMessageContentViewOptions
     ) -> some View {
         Group {
-            if let footballGameAttachmentPayload = quotedMessage
+            if let footballGameAttachmentPayload = options.quotedMessage
                 .attachments(payloadType: FootballGameAttachmentPayload.self)
                 .first?
                 .payload {
@@ -286,7 +285,6 @@ private class CustomQuotedContentViewFactory: ViewFactory {
                 // Fallback to default content view
                 QuotedMessageContentView(
                     factory: self,
-                    quotedMessage: quotedMessage,
                     options: options
                 )
             }