Bring back the original native MessageComposerTextField, use it whe… (#2696)

* Bring back the original native `MessageComposerTextField`, use it when the Rich Text Editor one is disabled (advanced settings) - this basically reverts parts of https://github.com/element-hq/element-x-ios/pull/1703
2026-11-03 06:55:59 +00:00 · 2024-04-15 18:41:34 +03:00
parent 00908073d2
commit 43c132720d
10 changed files with 320 additions and 29 deletions
@@ -91,7 +91,11 @@ struct ComposerToolbarViewState: BindableState {
        case .previewVoiceMessage:
            return true
        default:
-            return !composerEmpty
+            if ServiceLocator.shared.settings.richTextEditorEnabled {
+                return !composerEmpty
+            } else {
+                return !bindings.composerPlainText.isEmpty
+            }
        }
    }
    
@@ -99,7 +103,12 @@ struct ComposerToolbarViewState: BindableState {
        if case .previewVoiceMessage = composerMode {
            return false
        }
-        return composerEmpty
+        
+        if ServiceLocator.shared.settings.richTextEditorEnabled {
+            return composerEmpty
+        } else {
+            return bindings.composerPlainText.isEmpty
+        }
    }
    
    var isVoiceMessageModeActivated: Bool {
@@ -113,6 +122,7 @@ struct ComposerToolbarViewState: BindableState {
 }

 struct ComposerToolbarViewStateBindings {
+    var composerPlainText = ""
    var composerFocused = false
    var composerActionsEnabled = false
    var composerExpanded = false
@@ -121,18 +121,20 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
            }
        case .sendMessage:
            guard !state.sendButtonDisabled else { return }
-
+            
            switch state.composerMode {
            case .previewVoiceMessage:
                actionsSubject.send(.voiceMessage(.send))
            default:
-                let sendHTML = appSettings.richTextEditorEnabled
-                actionsSubject.send(.sendMessage(plain: wysiwygViewModel.content.markdown,
-                                                 html: sendHTML ? wysiwygViewModel.content.html : nil,
-                                                 mode: state.composerMode,
-                                                 intentionalMentions: wysiwygViewModel
-                                                     .getMentionsState()
-                                                     .toIntentionalMentions()))
+                if ServiceLocator.shared.settings.richTextEditorEnabled {
+                    let sendHTML = appSettings.richTextEditorEnabled
+                    actionsSubject.send(.sendMessage(plain: wysiwygViewModel.content.markdown,
+                                                     html: sendHTML ? wysiwygViewModel.content.html : nil,
+                                                     mode: state.composerMode,
+                                                     intentionalMentions: wysiwygViewModel.getMentionsState().toIntentionalMentions()))
+                } else {
+                    actionsSubject.send(.sendMessage(plain: context.composerPlainText, html: nil, mode: state.composerMode, intentionalMentions: .empty))
+                }
            }
        case .cancelReply:
            set(mode: .default)
@@ -260,12 +262,12 @@ final class ComposerToolbarViewModel: ComposerToolbarViewModelType, ComposerTool
    }

    private func set(text: String) {
-        wysiwygViewModel.textView.flushPills()
-        
-        if appSettings.richTextEditorEnabled {
+        if ServiceLocator.shared.settings.richTextEditorEnabled {
+            wysiwygViewModel.textView.flushPills()
+            
            wysiwygViewModel.setHtmlContent(text)
        } else {
-            wysiwygViewModel.setMarkdownContent(text)
+            state.bindings.composerPlainText = text
        }
    }

@@ -162,7 +162,8 @@ struct ComposerToolbar: View {
    }
    
    private var messageComposer: some View {
-        MessageComposer(composerView: composerView,
+        MessageComposer(plainText: $context.composerPlainText,
+                        composerView: composerView,
                        mode: context.viewState.composerMode,
                        showResizeGrabber: context.viewState.bindings.composerActionsEnabled,
                        isExpanded: $context.composerExpanded) {
@@ -22,6 +22,7 @@ typealias EnterKeyHandler = () -> Void
 typealias PasteHandler = (NSItemProvider) -> Void

 struct MessageComposer: View {
+    @Binding var plainText: String
    let composerView: WysiwygComposerView
    let mode: RoomScreenComposerMode
    let showResizeGrabber: Bool
@@ -32,6 +33,7 @@ struct MessageComposer: View {
    let editCancellationAction: () -> Void
    let onAppearAction: () -> Void
    
+    @State private var isMultiline = false
    @State private var composerTranslation: CGFloat = 0
    private let composerShape = RoundedRectangle(cornerRadius: 21, style: .circular)
    
@@ -66,19 +68,31 @@ struct MessageComposer: View {
    private var mainContent: some View {
        VStack(alignment: .leading, spacing: -6) {
            header
-            Color.clear
-                .overlay(alignment: .top) {
-                    composerView
-                        .clipped()
-                        .readFrame($composerFrame)
-                }
-                .frame(minHeight: ComposerConstant.minHeight, maxHeight: max(composerHeight, composerFrame.height),
-                       alignment: .top)
-                .tint(.compound.iconAccentTertiary)
-                .padding(.vertical, 10)
-                .onAppear {
-                    onAppearAction()
-                }
+            
+            if ServiceLocator.shared.settings.richTextEditorEnabled {
+                Color.clear
+                    .overlay(alignment: .top) {
+                        composerView
+                            .clipped()
+                            .readFrame($composerFrame)
+                    }
+                    .frame(minHeight: ComposerConstant.minHeight, maxHeight: max(composerHeight, composerFrame.height),
+                           alignment: .top)
+                    .tint(.compound.iconAccentTertiary)
+                    .padding(.vertical, 10)
+                    .onAppear {
+                        onAppearAction()
+                    }
+            } else {
+                MessageComposerTextField(placeholder: L10n.richTextEditorComposerPlaceholder,
+                                         text: $plainText,
+                                         isMultiline: $isMultiline,
+                                         maxHeight: 300,
+                                         enterKeyHandler: sendAction,
+                                         pasteHandler: pasteAction)
+                    .tint(.compound.iconAccentTertiary)
+                    .padding(.vertical, 10)
+            }
        }
    }

@@ -212,7 +226,8 @@ struct MessageComposer_Previews: PreviewProvider, TestablePreview {
                                               keyCommands: nil,
                                               pasteHandler: nil)
        
-        return MessageComposer(composerView: composerView,
+        return MessageComposer(plainText: .constant(content),
+                               composerView: composerView,
                               mode: mode,
                               showResizeGrabber: false,
                               isExpanded: .constant(false),
@@ -0,0 +1,247 @@
+//
+// Copyright 2022 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+import SwiftUI
+
+struct MessageComposerTextField: View {
+    let placeholder: String
+    @Binding var text: String
+    @Binding var isMultiline: Bool
+
+    let maxHeight: CGFloat
+    let enterKeyHandler: EnterKeyHandler
+    let pasteHandler: PasteHandler
+
+    var body: some View {
+        UITextViewWrapper(text: $text,
+                          isMultiline: $isMultiline,
+                          maxHeight: maxHeight,
+                          enterKeyHandler: enterKeyHandler,
+                          pasteHandler: pasteHandler)
+            .accessibilityLabel(placeholder)
+            .background(placeholderView, alignment: .topLeading)
+    }
+
+    @ViewBuilder
+    private var placeholderView: some View {
+        if text.isEmpty {
+            Text(placeholder)
+                .foregroundColor(.compound.textPlaceholder)
+                .accessibilityHidden(true)
+        }
+    }
+}
+
+private struct UITextViewWrapper: UIViewRepresentable {
+    typealias UIViewType = UITextView
+
+    @Binding var text: String
+    @Binding var isMultiline: Bool
+
+    let maxHeight: CGFloat
+
+    let enterKeyHandler: EnterKeyHandler
+    let pasteHandler: PasteHandler
+
+    private let font = UIFont.preferredFont(forTextStyle: .body)
+
+    func makeUIView(context: UIViewRepresentableContext<UITextViewWrapper>) -> UITextView {
+        // Need to use TextKit 1 for mentions
+        let textView = ElementTextView(usingTextLayoutManager: false)
+        textView.isMultiline = $isMultiline
+        textView.delegate = context.coordinator
+        textView.elementDelegate = context.coordinator
+        textView.textColor = .compound.textPrimary
+        textView.isEditable = true
+        textView.font = font
+        textView.isSelectable = true
+        textView.isUserInteractionEnabled = true
+        textView.backgroundColor = UIColor.clear
+        textView.returnKeyType = .default
+        textView.textContainer.lineFragmentPadding = 0.0
+        textView.textContainerInset = .zero
+        textView.keyboardType = .default
+
+        textView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+
+        return textView
+    }
+
+    func sizeThatFits(_ proposal: ProposedViewSize, uiView: UITextView, context: Context) -> CGSize? {
+        // Note: Coalescing a width of zero here returns a size for the view with 1 line of text visible.
+        let newSize = uiView.sizeThatFits(CGSize(width: proposal.width ?? .zero,
+                                                 height: CGFloat.greatestFiniteMagnitude))
+        let width = proposal.width ?? newSize.width
+        let height = min(maxHeight, newSize.height)
+
+        return CGSize(width: width, height: height)
+    }
+
+    func updateUIView(_ textView: UITextView, context: UIViewRepresentableContext<UITextViewWrapper>) {
+        if textView.text != text {
+            textView.text = text
+
+            if text.isEmpty {
+                // text cleared, probably because the written text is sent
+                // reload keyboard type
+                if textView.isFirstResponder {
+                    textView.keyboardType = .twitter
+                    textView.reloadInputViews()
+                    textView.keyboardType = .default
+                    textView.reloadInputViews()
+                }
+            }
+        }
+    }
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(text: $text,
+                    maxHeight: maxHeight,
+                    enterKeyHandler: enterKeyHandler,
+                    pasteHandler: pasteHandler)
+    }
+
+    final class Coordinator: NSObject, UITextViewDelegate, ElementTextViewDelegate {
+        private var text: Binding<String>
+
+        private let maxHeight: CGFloat
+
+        private let enterKeyHandler: EnterKeyHandler
+        private let pasteHandler: PasteHandler
+
+        init(text: Binding<String>,
+             maxHeight: CGFloat,
+             enterKeyHandler: @escaping EnterKeyHandler,
+             pasteHandler: @escaping PasteHandler) {
+            self.text = text
+            self.maxHeight = maxHeight
+            self.enterKeyHandler = enterKeyHandler
+            self.pasteHandler = pasteHandler
+        }
+
+        func textViewDidChange(_ textView: UITextView) {
+            text.wrappedValue = textView.text
+        }
+
+        func textViewDidReceiveEnterKeyPress(_ textView: UITextView) {
+            enterKeyHandler()
+        }
+
+        func textViewDidReceiveShiftEnterKeyPress(_ textView: UITextView) {
+            textView.insertText("\n")
+        }
+
+        func textView(_ textView: UITextView, didReceivePasteWith provider: NSItemProvider) {
+            pasteHandler(provider)
+        }
+    }
+}
+
+private protocol ElementTextViewDelegate: AnyObject {
+    func textViewDidReceiveShiftEnterKeyPress(_ textView: UITextView)
+    func textViewDidReceiveEnterKeyPress(_ textView: UITextView)
+    func textView(_ textView: UITextView, didReceivePasteWith provider: NSItemProvider)
+}
+
+private class ElementTextView: UITextView {
+    weak var elementDelegate: ElementTextViewDelegate?
+
+    var isMultiline: Binding<Bool>?
+
+    override var keyCommands: [UIKeyCommand]? {
+        [UIKeyCommand(input: "\r", modifierFlags: .shift, action: #selector(shiftEnterKeyPressed)),
+         UIKeyCommand(input: "\r", modifierFlags: [], action: #selector(enterKeyPressed))]
+    }
+
+    @objc func shiftEnterKeyPressed(sender: UIKeyCommand) {
+        elementDelegate?.textViewDidReceiveShiftEnterKeyPress(self)
+    }
+
+    @objc func enterKeyPressed(sender: UIKeyCommand) {
+        elementDelegate?.textViewDidReceiveEnterKeyPress(self)
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        guard let isMultiline, let font else { return }
+
+        let numberOfLines = frame.height / font.lineHeight
+        if numberOfLines > 1.5 {
+            if !isMultiline.wrappedValue {
+                isMultiline.wrappedValue = true
+            }
+        } else {
+            if isMultiline.wrappedValue {
+                isMultiline.wrappedValue = false
+            }
+        }
+    }
+
+    // Pasting support
+
+    override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {
+        if super.canPerformAction(action, withSender: sender) {
+            return true
+        }
+
+        guard action == #selector(paste(_:)) else {
+            return false
+        }
+
+        return UIPasteboard.general.itemProviders.first?.isSupportedForPasteOrDrop ?? false
+    }
+
+    override func paste(_ sender: Any?) {
+        guard let provider = UIPasteboard.general.itemProviders.first,
+              provider.isSupportedForPasteOrDrop else {
+            // If the item is not supported for media upload then
+            // just try pasting its contents into the textfield
+            super.paste(sender)
+            return
+        }
+
+        elementDelegate?.textView(self, didReceivePasteWith: provider)
+    }
+}
+
+struct MessageComposerTextField_Previews: PreviewProvider, TestablePreview {
+    static var previews: some View {
+        VStack(spacing: 16) {
+            PreviewWrapper(text: "123")
+            PreviewWrapper(text: "")
+            PreviewWrapper(text: "A really long message that will wrap to multiple lines on a phone in portrait.")
+        }
+    }
+
+    struct PreviewWrapper: View {
+        @State var text: String
+        @State var isMultiline: Bool
+
+        init(text: String) {
+            _text = .init(initialValue: text)
+            _isMultiline = .init(initialValue: false)
+        }
+
+        var body: some View {
+            MessageComposerTextField(placeholder: "Placeholder",
+                                     text: $text,
+                                     isMultiline: $isMultiline,
+                                     maxHeight: 300,
+                                     enterKeyHandler: { },
+                                     pasteHandler: { _ in })
+        }
+    }
+}