Merge pull request #9887 from nextcloud/fix/9886/smart-picker

fix: lost focus in reference picker

src/components/Composer.vue

@@ -4,7 +4,10 @@
 -->
 <template>
 	<div class="message-composer">
-		<NcReferencePickerModal v-if="isPickerAvailable && isPickerOpen" @submit="onPicked" @cancel="closePicker" />
+		<NcReferencePickerModal v-if="isPickerAvailable && isPickerOpen"
+			id="reference-picker"
+			@submit="onPicked"
+			@cancel="closePicker" />
 		<div class="composer-fields composer-fields__from mail-account">
 			<label class="from-label" for="from">
 				{{ t('mail', 'From') }}

src/components/NewMessageModal.vue

@@ -6,7 +6,7 @@
 	<Modal v-if="showMessageComposer"
 		:size="largerModal ? 'large' : 'normal'"
 		:name="modalTitle"
-		:additional-trap-elements="toolbarElements"
+		:additional-trap-elements="additionalTrapElements"
 		@close="$event.type === 'click' ? onClose() : onMinimize()">
 		<EmptyContent v-if="error"
 			:name="t('mail', 'Error sending your message')"
@@ -159,7 +159,7 @@ export default {
 	},
 	data() {
 		return {
-			toolbarElements: undefined,
+			additionalTrapElements: ['#reference-picker'],
 			original: undefined,
 			draftsPromise: Promise.resolve(),
 			attachmentsPromise: Promise.resolve(),
@@ -243,7 +243,7 @@ export default {
 			}
 		},
 		handleShow(element) {
-			this.toolbarElements = [element]
+			this.additionalTrapElements.push(element)
 		},
 		toHtml,
 		plain,