Skip to content

Commit 51debd5

Browse files
committed
Display disabled message form in read-only rooms
Signed-off-by: Vincent Petry <[email protected]>
1 parent cbb16c0 commit 51debd5

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

src/components/ChatView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</transition>
4545
<MessagesList
4646
:token="token" />
47-
<NewMessageForm v-if="!isReadOnly" />
47+
<NewMessageForm />
4848
</div>
4949
</template>
5050

src/components/NewMessageForm/AdvancedInput/AdvancedInput.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export default {
175175
*/
176176
placeholderText: {
177177
type: String,
178-
default: t('spreed', 'Write message, @ to mention someone …'),
178+
default: '',
179179
},
180180
181181
/**

src/components/NewMessageForm/NewMessageForm.vue

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
</Actions>
5959
</div>
6060
<div
61+
v-if="!isReadOnly"
6162
class="new-message-form__button">
6263
<EmojiPicker @select="addEmoji">
6364
<button
@@ -80,11 +81,14 @@
8081
ref="advancedInput"
8182
v-model="text"
8283
:token="token"
84+
:active-input="!isReadOnly"
85+
:placeholder-text="placeholderText"
8386
@update:contentEditable="contentEditableToParsed"
8487
@submit="handleSubmit"
8588
@files-pasted="handleFiles" />
8689
</div>
8790
<button
91+
:disabled="isReadOnly"
8892
type="submit"
8993
:aria-label="t('spreed', 'Send message')"
9094
class="new-message-form__button submit icon-confirm-fade"
@@ -149,6 +153,16 @@ export default {
149153
}
150154
},
151155
156+
isReadOnly() {
157+
return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
158+
},
159+
160+
placeholderText() {
161+
return this.isReadOnly
162+
? t('spreed', 'This conversation has been locked')
163+
: t('spreed', 'Write message, @ to mention someone …')
164+
},
165+
152166
messageToBeReplied() {
153167
return this.$store.getters.getMessageToBeReplied(this.token)
154168
},
@@ -158,7 +172,7 @@ export default {
158172
},
159173
160174
canShareAndUploadFiles() {
161-
return !this.currentUserIsGuest && this.conversation.readOnly === CONVERSATION.STATE.READ_WRITE
175+
return !this.currentUserIsGuest && !this.isReadOnly
162176
},
163177
164178
attachmentFolder() {

0 commit comments

Comments
 (0)