Merge branch 'feat/room-abbreviations' into integration

# Conflicts:
#	src/app/components/message/RenderBody.tsx

Author: Just-Insane

src/app/components/message/RenderBody.tsx

@@ -1,4 +1,4 @@
-import { type MouseEventHandler, type ReactNode, useEffect, useState } from 'react';
+import { type MouseEventHandler, useEffect, useState } from 'react';
 import parse, { type HTMLReactParserOptions } from 'html-react-parser';
 import Linkify from 'linkify-react';
 import { type Opts } from 'linkifyjs';
@@ -66,9 +66,9 @@ function AbbreviationTerm({ text, definition }: AbbreviationTermProps) {
  */
 export function buildAbbrReplaceTextNode(
   abbrMap: Map<string, string>
-): ((text: string) => ReactNode | undefined) | undefined {
+): ((text: string) => JSX.Element | undefined) | undefined {
   if (abbrMap.size === 0) return undefined;
-  return function (text: string) {
+  return function replaceTextNode(text: string) {
     const segments = splitByAbbreviations(text, abbrMap);
     if (!segments.some((s) => s.termKey !== undefined)) return undefined;
     return (

src/app/plugins/react-custom-html-parser.tsx

@@ -351,7 +351,7 @@ export const getReactCustomHtmlParser = (
     useAuthentication?: boolean;
     nicknames?: Nicknames;
     autoplayEmojis?: boolean;
-    replaceTextNode?: (text: string) => ReactNode | undefined;
+    replaceTextNode?: (text: string) => JSX.Element | undefined;
   }
 ): HTMLReactParserOptions => {
   const { replaceTextNode } = params;