fix enter & empty messages

This commit is contained in:
7w1 committed 2026-03-17 11:44:02 -05:00
1 parent 9ed985a2a8
commit 2a42941e4b
4 files changed
+42 -22

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
---
default: patch
---
Fix messages with body empty but formatted body filled rendering as empty.
+5
View File
@@ -0,0 +1,5 @@
---
default: patch
---
Fix emoticon autocomplete not respecting character threshold setting.
+2 -1
View File
@@ -20,11 +20,12 @@ export function RenderBody({
htmlReactParserOptions,
linkifyOpts,
}: Readonly<RenderBodyProps>) {
if (body === '') return <MessageEmptyContent />;
if (customBody) {
if (customBody === '') return <MessageEmptyContent />;
return parse(sanitizeCustomHtml(customBody), htmlReactParserOptions);
}
if (body === '') return <MessageEmptyContent />;
return (
<Linkify options={linkifyOpts}>
{highlightRegex
+30 -21
View File
@@ -805,38 +805,47 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
const handleKeyDown: KeyboardEventHandler = useCallback(
(evt) => {
if (autocompleteQuery && isKeyHotkey('arrowdown', evt)) {
evt.preventDefault();
document
.querySelector('[data-autocomplete-menu]')
?.dispatchEvent(new CustomEvent('autocomplete-navigate', { detail: { direction: 1 } }));
return;
}
if (autocompleteQuery && isKeyHotkey('arrowup', evt)) {
evt.preventDefault();
document
.querySelector('[data-autocomplete-menu]')
?.dispatchEvent(
const autocompleteMenu = document.querySelector('[data-autocomplete-menu]');
const isMenuVisible = !!(autocompleteQuery && autocompleteMenu);
if (isMenuVisible) {
if (isKeyHotkey('arrowdown', evt)) {
evt.preventDefault();
autocompleteMenu.dispatchEvent(
new CustomEvent('autocomplete-navigate', { detail: { direction: 1 } })
);
return;
}
if (isKeyHotkey('arrowup', evt)) {
evt.preventDefault();
autocompleteMenu.dispatchEvent(
new CustomEvent('autocomplete-navigate', { detail: { direction: -1 } })
);
return;
return;
}
if (isKeyHotkey('enter', evt) && !isComposing(evt)) {
const selectedItem =
autocompleteMenu.querySelector<HTMLButtonElement>('button[data-selected]') ??
autocompleteMenu.querySelector<HTMLButtonElement>('button');
if (selectedItem) {
evt.preventDefault();
selectedItem.click();
return;
}
}
}
if (
(isKeyHotkey('mod+enter', evt) || (!enterForNewline && isKeyHotkey('enter', evt))) &&
!isComposing(evt)
) {
evt.preventDefault();
if (autocompleteQuery) {
const selectedItem =
document.querySelector<HTMLButtonElement>(
'[data-autocomplete-menu] button[data-selected]'
) ?? document.querySelector<HTMLButtonElement>('[data-autocomplete-menu] button');
selectedItem?.click();
return;
}
submit().catch((error) => {
log.error('submit failed', { roomId }, error);
});
return;
}
if (isKeyHotkey('escape', evt)) {
evt.preventDefault();