fix: regex state machine stack depth crash

GetStream · Nov 18, 2024 · 99abac0 · 99abac0
1 parent e029830
commit 99abac0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
@@ -584,7 +584,7 @@ const ChannelWithContext = <
     MessageStatus = MessageStatusDefault,
     MessageSystem = MessageSystemDefault,
     MessageText,
-    messageTextNumberOfLines = 5,
+    messageTextNumberOfLines,
     MessageTimestamp = MessageTimestampDefault,
     MessageUserReactions = MessageUserReactionsDefault,
     MessageUserReactionsAvatar = MessageUserReactionsAvatarDefault,

diff --git a/package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts b/package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts
@@ -35,5 +35,11 @@ export const generateMarkdownText = (text?: string) => {
 
   resultText = resultText.replace(/[<"'>]/g, '\\$&');
 
+  // Remove whitespaces that come directly after newlines except in code blocks where we deem this allowed.
+  resultText = resultText.replace(/(```[\s\S]*?```|`.*?`)|\n[ ]{2,}/g, (_, code) => {
+    if (code) return code;
+    return '\n';
+  });
+
   return resultText;
 };