diff --git a/.changeset/fix-empty-message.md b/.changeset/fix-empty-message.md new file mode 100644 index 00000000..2febfa10 --- /dev/null +++ b/.changeset/fix-empty-message.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Fix messages with body empty but formatted body filled rendering as empty. diff --git a/.changeset/fix-enter-autocomplete.md b/.changeset/fix-enter-autocomplete.md new file mode 100644 index 00000000..c44d196b --- /dev/null +++ b/.changeset/fix-enter-autocomplete.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Fix emoticon autocomplete not respecting character threshold setting. diff --git a/src/app/components/message/RenderBody.tsx b/src/app/components/message/RenderBody.tsx index bfd3bdc5..03714750 100644 --- a/src/app/components/message/RenderBody.tsx +++ b/src/app/components/message/RenderBody.tsx @@ -20,11 +20,12 @@ export function RenderBody({ htmlReactParserOptions, linkifyOpts, }: Readonly) { - if (body === '') return ; if (customBody) { if (customBody === '') return ; return parse(sanitizeCustomHtml(customBody), htmlReactParserOptions); } + if (body === '') return ; + return ( {highlightRegex diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx index 60ee8d20..16b4a04e 100644 --- a/src/app/features/room/RoomInput.tsx +++ b/src/app/features/room/RoomInput.tsx @@ -805,38 +805,47 @@ export const RoomInput = forwardRef( 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('button[data-selected]') ?? + autocompleteMenu.querySelector('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( - '[data-autocomplete-menu] button[data-selected]' - ) ?? document.querySelector('[data-autocomplete-menu] button'); - selectedItem?.click(); - return; - } submit().catch((error) => { log.error('submit failed', { roomId }, error); }); + return; } if (isKeyHotkey('escape', evt)) { evt.preventDefault();