From d5bd05d0bbdc907bab0005060fb44e49c04414b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Mon, 30 Jan 2023 12:10:28 +0100
Subject: [PATCH] Fix: cannot select text in plain text mode in Rich Text
 Editor

---
 changelog.d/7801.bugfix                                         | 1 +
 library/ui-styles/src/main/res/values/styles_edit_text.xml      | 1 -
 .../home/room/detail/composer/RichTextComposerLayout.kt         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/7801.bugfix

diff --git a/changelog.d/7801.bugfix b/changelog.d/7801.bugfix
new file mode 100644
index 0000000000..4ab8d7feda
--- /dev/null
+++ b/changelog.d/7801.bugfix
@@ -0,0 +1 @@
+Cannot select text properly in plain text mode when using Rich Text Editor.
diff --git a/library/ui-styles/src/main/res/values/styles_edit_text.xml b/library/ui-styles/src/main/res/values/styles_edit_text.xml
index 6b282a7674..abb180ad87 100644
--- a/library/ui-styles/src/main/res/values/styles_edit_text.xml
+++ b/library/ui-styles/src/main/res/values/styles_edit_text.xml
@@ -15,7 +15,6 @@
         <item name="android:background">@android:color/transparent</item>
         <item name="android:inputType">textCapSentences|textMultiLine</item>
         <item name="android:maxLines">10</item>
-        <item name="android:minHeight">40dp</item>
         <item name="android:paddingTop">10dp</item>
         <item name="android:paddingBottom">10dp</item>
         <item name="paddingStart">12dp</item>
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
index 1bb82b41fe..b60b1ca843 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
@@ -291,7 +291,7 @@ internal class RichTextComposerLayout @JvmOverloads constructor(
 
     private fun updateEditTextVisibility() {
         views.richTextComposerEditText.isVisible = isTextFormattingEnabled
-        views.richTextMenu.isVisible = isTextFormattingEnabled
+        views.richTextMenuScrollView.isVisible = isTextFormattingEnabled
         views.plainTextComposerEditText.isVisible = !isTextFormattingEnabled
 
         // The layouts for formatted text mode and plain text mode are different, so we need to update the constraints