Merge c2b99ec into 72ad34e

okTurtles · Aug 5, 2024 · 794b731 · 794b731
2 parents 72ad34e + c2b99ec
commit 794b731
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/frontend/views/containers/chatroom/SendArea.vue b/frontend/views/containers/chatroom/SendArea.vue
@@ -63,6 +63,7 @@
       :disabled='loading'
       :placeholder='L("Write your message...")'
       :style='textareaStyles'
+      :maxlength='config.messageMaxChar'
       @blur='textAreaBlur'
       @keydown.enter.exact.prevent='handleKeyDownEnter'
       @keydown.tab.exact='handleKeyDownTab'
@@ -273,7 +274,8 @@ import { makeMentionFromUsername, makeChannelMention } from '@model/contracts/sh
 import {
   CHATROOM_PRIVACY_LEVEL,
   CHATROOM_MEMBER_MENTION_SPECIAL_CHAR,
-  CHATROOM_CHANNEL_MENTION_SPECIAL_CHAR
+  CHATROOM_CHANNEL_MENTION_SPECIAL_CHAR,
+  CHATROOM_MAX_MESSAGE_LEN
 } from '@model/contracts/shared/constants.js'
 import { CHAT_ATTACHMENT_SIZE_LIMIT } from '~/frontend/utils/constants.js'
 import { OPEN_MODAL, CHATROOM_USER_TYPING, CHATROOM_USER_STOP_TYPING } from '@utils/events.js'
@@ -351,6 +353,9 @@ export default ({
         staleObjectURLs: [],
         typingUsers: []
       },
+      config: {
+        messageMaxChar: CHATROOM_MAX_MESSAGE_LEN
+      },
       typingUserTimeoutIds: {},
       throttledEmitUserTypingEvent: throttle(this.emitUserTypingEvent, 500)
     }
@@ -943,6 +948,12 @@ export default ({
     background-color: transparent;
     border: none;
     padding: 0.5rem;
+    max-height: 9rem;
+    overflow-y: auto;
+
+    @include tablet {
+      max-height: 12.25rem;
+    }
 
     &::-webkit-scrollbar {
       display: none;