Merge pull request #11376 from nextcloud/backport/11375/stable28

[stable28] fix(conversation): make description multi-line
nextcloud · Jan 12, 2024 · c11a94c · c11a94c
2 parents b66b259 + 8e4d749
commit c11a94c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/components/ConversationSettings/BasicInfo.vue b/src/components/ConversationSettings/BasicInfo.vue
@@ -42,6 +42,7 @@
 				:loading="isDescriptionLoading"
 				:edit-button-aria-label="t('spreed', 'Edit conversation description')"
 				:placeholder="t('spreed', 'Enter a description for this conversation')"
+				multiline
 				use-markdown
 				@submit-text="handleUpdateDescription"
 				@update:editing="handleEditDescription" />

diff --git a/src/components/ConversationSettings/EditableTextField.vue b/src/components/ConversationSettings/EditableTextField.vue
@@ -31,6 +31,7 @@
 			:value.sync="text"
 			:auto-complete="()=>{}"
 			:maxlength="maxLength"
+			:multiline="multiline"
 			:contenteditable="!loading"
 			:placeholder="placeholder"
 			@submit="handleSubmitText"
@@ -154,6 +155,11 @@ export default {
 			required: true,
 		},
 
+		multiline: {
+			type: Boolean,
+			default: false,
+		},
+
 		useMarkdown: {
 			type: Boolean,
 			default: false,

diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
@@ -39,7 +39,7 @@
 						:label="t('spreed', 'Name')"
 						label-visible
 						@keydown.enter="handleEnter" />
-					<NcTextField v-model="conversationDescription"
+					<NcTextArea v-model="conversationDescription"
 						:placeholder="t('spreed', 'Enter a description for this conversation')"
 						:label="t('spreed', 'Description')"
 						label-visible />
@@ -173,6 +173,7 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadi
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
+import NcTextArea from '@nextcloud/vue/dist/Components/NcTextArea.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
 import SetContacts from './SetContacts/SetContacts.vue'
@@ -214,6 +215,7 @@ export default {
 		NcEmptyContent,
 		NcModal,
 		NcPasswordField,
+		NcTextArea,
 		NcTextField,
 		SetContacts,
 		Check,