Skip to content

Commit a746bfc

Browse files
committed
fix(NewMessage): migrate to new container prop
- to merged after upstream bump [skip ci] Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
1 parent e22b743 commit a746bfc

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

src/components/BreakoutRoomsEditor/SendMessageDialog.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
<template>
77
<NcDialog
8+
:id="dialogMaskId"
89
ref="dialog"
910
:name="dialogTitle"
1011
closeOnClickOutside
@@ -25,6 +26,7 @@
2526

2627
<script>
2728
import { t } from '@nextcloud/l10n'
29+
import { useId } from 'vue'
2830
import NcDialog from '@nextcloud/vue/components/NcDialog'
2931
import NewMessage from '../NewMessage/NewMessage.vue'
3032
@@ -66,15 +68,17 @@ export default {
6668
6769
emits: ['close', 'submit'],
6870
69-
data() {
71+
setup() {
72+
const dialogMaskId = `new-message-upload-${useId()}`
73+
const modalContainerId = '#' + dialogMaskId
74+
7075
return {
71-
modalContainerId: null,
76+
dialogMaskId,
77+
modalContainerId,
7278
}
7379
},
7480
7581
mounted() {
76-
// Postpone render of NewMessage until modal container is mounted
77-
this.modalContainerId = '#' + this.$refs.dialog.$el.querySelector('.modal-container')?.id
7882
this.$nextTick(() => {
7983
this.$refs.newMessage.focusInput()
8084
})

src/components/NewMessage/NewMessage.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,13 @@
126126

127127
<NcRichContenteditable
128128
ref="richContenteditable"
129-
:key="container"
130129
v-model="text"
131130
:class="{ 'new-message-form__input-rich--required': errorMessage }"
132131
:title="errorMessage"
133132
:autoComplete="autoComplete"
134133
:disabled="disabled"
135134
:userData="userData"
136-
:menuContainer="containerElement"
135+
:menuContainer="container"
137136
:placeholder="placeholderText"
138137
:aria-label="placeholderText"
139138
:dir="text ? 'auto' : undefined"
@@ -646,10 +645,6 @@ export default {
646645
return this.text.trim() !== ''
647646
},
648647
649-
containerElement() {
650-
return document.querySelector(this.container)
651-
},
652-
653648
isOneToOne() {
654649
return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
655650
|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER

src/components/NewMessage/NewMessageUploadEditor.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ export default {
112112
},
113113
114114
setup() {
115-
const modalContainerId = ref(null)
116115
const isDraggingOver = ref(false)
117116
const dialogMaskId = `new-message-upload-${useId()}`
118117
const dialogHeaderId = `new-message-upload-header-${useId()}`
118+
const modalContainerId = '#' + dialogMaskId
119119
120120
return {
121121
modalContainerId,
@@ -178,7 +178,6 @@ export default {
178178
if (show) {
179179
// Wait for modal content to be rendered
180180
await this.$nextTick()
181-
this.modalContainerId = `#${this.dialogMaskId}`
182181
if (this.supportMediaCaption) {
183182
this.$refs.newMessage.focusInput()
184183
} else {

0 commit comments

Comments
 (0)