Uncomment forgotten code

Author: f3dm76

Sources/ExyteChat/Views/Attachments/AttachmentsEditor.swift

@@ -26,7 +26,6 @@ struct AttachmentsEditor<InputViewContent: View>: View {
     var mediaPickerParameters: MediaPickerParameters
     var availableInputs: [AvailableInputType]
     var localization: ChatLocalization
-    var messageStyler: (String) -> AttributedString
 
     @State private var seleсtedMedias: [Media] = []
     @State private var currentFullscreenMedia: Media?

Sources/ExyteChat/Views/ChatView.swift

@@ -105,11 +105,68 @@ public struct ChatView<MessageContent: View, InputViewContent: View, MenuAction:
         mainView
             .background(chatBackground())
             .environmentObject(keyboardState)
-        
+            .onAppear {
+                if isGiphyAvailable() {
+                    if let giphyKey = giphyConfig.giphyKey {
+                        if !giphyConfigured {
+                            giphyConfigured = true
+                            Giphy.configure(apiKey: giphyKey)
+                        }
+                    } else {
+                        print("WARNING: giphy key not provided, please pass a key using giphyConfig")
+                    }
+                }
+            }
+            .onChange(of: inputViewModel.text) { _ , newValue in
+                inputViewCustomizationParameters.onInputTextChange?(newValue)
+            }
+            .onChange(of: inputViewCustomizationParameters.externalInputText) {
+                DispatchQueue.main.async {
+                    inputViewModel.text = inputViewCustomizationParameters.externalInputText ?? ""
+                }
+            }
+            .onChange(of: selectedGiphyMedia) {
+                if let giphyMedia = selectedGiphyMedia {
+                    inputViewModel.attachments.giphyMedia = giphyMedia
+                    inputViewModel.send()
+                }
+            }
+            .onChange(of: inputViewModel.showPicker) { _ , newValue in
+                if newValue {
+                    globalFocusState.focus = nil
+                }
+            }
+            .onChange(of: inputViewModel.showGiphyPicker) { _ , newValue in
+                if newValue {
+                    globalFocusState.focus = nil
+                }
+            }
+            .sheet(isPresented: $inputViewModel.showGiphyPicker) {
+                if giphyConfig.giphyKey != nil {
+                    GiphyEditorView(
+                        giphyConfig: giphyConfig,
+                        selectedMedia: $selectedGiphyMedia
+                    )
+                    .environmentObject(globalFocusState)
+                } else {
+                    Text("no giphy key found")
+                }
+            }
+            .fullScreenCover(isPresented: $inputViewModel.showPicker) {
+                AttachmentsEditor(
+                    inputViewModel: inputViewModel,
+                    inputViewBuilder: inputViewBuilder,
+                    mediaPickerParameters: inputViewCustomizationParameters.mediaPickerParameters,
+                    availableInputs: inputViewCustomizationParameters.availableInputs,
+                    localization: chatCustomizationParameters.localization
+                )
+                .environmentObject(globalFocusState)
+                .environmentObject(keyboardState)
+            }
             .fullScreenCover(isPresented: $viewModel.fullscreenAttachmentPresented) {
                 let attachments = sections.flatMap { section in section.rows.flatMap { $0.message.attachments } }
                 let index = attachments.firstIndex { $0.id == viewModel.fullscreenAttachmentItem?.id }
-                
+
                 GeometryReader { g in
                     FullscreenMediaPages(
                         viewModel: FullscreenMediaPagesViewModel(
@@ -124,66 +181,6 @@ public struct ChatView<MessageContent: View, InputViewContent: View, MenuAction:
                     .ignoresSafeArea()
                 }
             }
-//            .onAppear {
-//                if isGiphyAvailable() {
-//                    if let giphyKey = giphyConfig.giphyKey {
-//                        if !giphyConfigured {
-//                            giphyConfigured = true
-//                            Giphy.configure(apiKey: giphyKey)
-//                        }
-//                    } else {
-//                        print("WARNING: giphy key not provided, please pass a key using giphyConfig")
-//                    }
-//                }
-//            }
-//            .onChange(of: inputViewModel.text) { _ , newValue in
-//                inputViewCustomizationParameters.onInputTextChange?(newValue)
-//            }
-//            .onChange(of: inputViewCustomizationParameters.externalInputText) {
-//                DispatchQueue.main.async {
-//                    inputViewModel.text = inputViewCustomizationParameters.externalInputText ?? ""
-//                }
-//            }
-//            .onChange(of: selectedGiphyMedia) {
-//                if let giphyMedia = selectedGiphyMedia {
-//                    inputViewModel.attachments.giphyMedia = giphyMedia
-//                    inputViewModel.send()
-//                }
-//            }
-//            .sheet(isPresented: $inputViewModel.showGiphyPicker) {
-//                if giphyConfig.giphyKey != nil {
-//                    GiphyEditorView(
-//                        giphyConfig: giphyConfig,
-//                        selectedMedia: $selectedGiphyMedia
-//                    )
-//                    .environmentObject(globalFocusState)
-//                } else {
-//                    Text("no giphy key found")
-//                }
-//            }
-//            .fullScreenCover(isPresented: $inputViewModel.showPicker) {
-//                AttachmentsEditor(
-//                    inputViewModel: inputViewModel,
-//                    inputViewBuilder: inputViewBuilder,
-//                    mediaPickerParameters: inputViewCustomizationParameters.mediaPickerParameters,
-//                    availableInputs: inputViewCustomizationParameters.availableInputs,
-//                    localization: chatCustomizationParameters.localization,
-//                    messageStyler: messageCustomizationParameters.styler
-//                )
-//                .environmentObject(globalFocusState)
-//                .environmentObject(keyboardState)
-//            }
-        
-            .onChange(of: inputViewModel.showPicker) { _ , newValue in
-                if newValue {
-                    globalFocusState.focus = nil
-                }
-            }
-            .onChange(of: inputViewModel.showGiphyPicker) { _ , newValue in
-                if newValue {
-                    globalFocusState.focus = nil
-                }
-            }
             .background {
                 // assume all the time views have same width, like "00:00"
                 if let anyMessage = sections.first?.rows.first?.message, timeViewSize == .zero {

Sources/ExyteChat/Views/MessageView/MessageView.swift

@@ -179,7 +179,8 @@ struct MessageView: View {
                     }
                 }
             }
-            .padding(.vertical, (params.showUsername && !message.user.isCurrentUser) || message.attachments.isEmpty ? 8 : 0)
+            .padding(.top, (params.showUsername && !message.user.isCurrentUser) || message.attachments.isEmpty ? 8 : 0)
+            .padding(.bottom, 8)
             .bubbleBackground(message, theme: theme)
             .zIndex(0)
         }