opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-21 05:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug where attachment-only post would send on enter when when set to only send on ctrl/cmd + enter (#35828)

Browse Source
This commit is contained in:
Harshil Sharma
2026-04-06 08:50:40 +05:30
committed by GitHub
parent ad35eba60b
commit 0ca124fa8f
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/channels/src/utils/post_utils.test.tsx
+12 -4
View File
@@ -526,10 +526,6 @@ describe('PostUtils.postMessageOnKeyPress', () => {
name: 'no override: empty message',
input: {event: {keyCode: 13}, message: '', sendMessageOnCtrlEnter: false, sendCodeBlockOnCtrlEnter: false},
expected: {allowSending: true},
}, {
name: 'no override: empty message on ctrl + enter',
input: {event: {keyCode: 13}, message: '', sendMessageOnCtrlEnter: true, sendCodeBlockOnCtrlEnter: false},
expected: {allowSending: true},
}];
for (const testCase of noOverrideCases) {
@@ -550,6 +546,18 @@ describe('PostUtils.postMessageOnKeyPress', () => {
// on sending of message on Ctrl + Enter
const sendMessageOnCtrlEnterCases = [{
name: 'sendMessageOnCtrlEnter: Test for empty message on CTRL+ENTER setting, no ctrlKey|metaKey - should not allow sending (attachment-only messages)',
input: {event: {keyCode: 13}, message: '', sendMessageOnCtrlEnter: true, sendCodeBlockOnCtrlEnter: false},
expected: {allowSending: false},
}, {
name: 'sendMessageOnCtrlEnter: Test for empty message on CTRL+ENTER setting, with ctrlKey - should allow sending',
input: {event: {keyCode: 13, ctrlKey: true}, message: '', sendMessageOnCtrlEnter: true, sendCodeBlockOnCtrlEnter: false},
expected: {allowSending: true},
}, {
name: 'sendMessageOnCtrlEnter: Test for empty message on CTRL+ENTER setting, with metaKey - should allow sending',
input: {event: {keyCode: 13, metaKey: true}, message: '', sendMessageOnCtrlEnter: true, sendCodeBlockOnCtrlEnter: false},
expected: {allowSending: true},
}, {
name: 'sendMessageOnCtrlEnter: Test for overriding sending of message on CTRL+ENTER, no ctrlKey|metaKey',
input: {event: {keyCode: 13}, message: 'message', sendMessageOnCtrlEnter: true, sendCodeBlockOnCtrlEnter: false},
expected: {allowSending: false},
webapp/channels/src/utils/post_utils.ts
+4 -4
View File
@@ -334,10 +334,7 @@ export function postMessageOnKeyPress(
return {allowSending: false, ignoreKeyPress: true};
}
if (
message.trim() === '' ||
!(sendMessageOnCtrlEnter || sendCodeBlockOnCtrlEnter)
) {
if (!(sendMessageOnCtrlEnter || sendCodeBlockOnCtrlEnter)) {
return {allowSending: true};
}
@@ -346,6 +343,9 @@ export function postMessageOnKeyPress(
if (sendMessageOnCtrlEnter) {
return sendOnCtrlEnter(message, ctrlOrMetaKeyPressed, true, caretPosition);
} else if (sendCodeBlockOnCtrlEnter) {
if (message.trim() === '') {
return {allowSending: true};
}
return sendOnCtrlEnter(message, ctrlOrMetaKeyPressed, false, caretPosition);
}