Skip to content

Commit 32115ca

Browse files
authored
Merge pull request #2789 from GetStream/fix/regex-max-stack-depth-crash
fix: regex max stack depth crash
2 parents e029830 + e847dca commit 32115ca

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

Diff for: package/src/components/Channel/Channel.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ const ChannelWithContext = <
584584
MessageStatus = MessageStatusDefault,
585585
MessageSystem = MessageSystemDefault,
586586
MessageText,
587-
messageTextNumberOfLines = 5,
587+
messageTextNumberOfLines,
588588
MessageTimestamp = MessageTimestampDefault,
589589
MessageUserReactions = MessageUserReactionsDefault,
590590
MessageUserReactionsAvatar = MessageUserReactionsAvatarDefault,

Diff for: package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts

+6
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,11 @@ export const generateMarkdownText = (text?: string) => {
3535

3636
resultText = resultText.replace(/[<"'>]/g, '\\$&');
3737

38+
// Remove whitespaces that come directly after newlines except in code blocks where we deem this allowed.
39+
resultText = resultText.replace(/(```[\s\S]*?```|`.*?`)|\n[ ]{2,}/g, (_, code) => {
40+
if (code) return code;
41+
return '\n';
42+
});
43+
3844
return resultText;
3945
};

Diff for: package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap

+16-4
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,12 @@ exports[`Thread should match thread snapshot 1`] = `
475475
}
476476
>
477477
<Text
478-
numberOfLines={5}
479478
style={
480479
{
480+
"alignItems": "flex-start",
481+
"flexDirection": "row",
482+
"flexWrap": "wrap",
483+
"justifyContent": "flex-start",
481484
"marginBottom": 8,
482485
"marginTop": 8,
483486
}
@@ -823,9 +826,12 @@ exports[`Thread should match thread snapshot 1`] = `
823826
}
824827
>
825828
<Text
826-
numberOfLines={5}
827829
style={
828830
{
831+
"alignItems": "flex-start",
832+
"flexDirection": "row",
833+
"flexWrap": "wrap",
834+
"justifyContent": "flex-start",
829835
"marginBottom": 8,
830836
"marginTop": 8,
831837
}
@@ -1171,9 +1177,12 @@ exports[`Thread should match thread snapshot 1`] = `
11711177
}
11721178
>
11731179
<Text
1174-
numberOfLines={5}
11751180
style={
11761181
{
1182+
"alignItems": "flex-start",
1183+
"flexDirection": "row",
1184+
"flexWrap": "wrap",
1185+
"justifyContent": "flex-start",
11771186
"marginBottom": 8,
11781187
"marginTop": 8,
11791188
}
@@ -1553,9 +1562,12 @@ exports[`Thread should match thread snapshot 1`] = `
15531562
}
15541563
>
15551564
<Text
1556-
numberOfLines={5}
15571565
style={
15581566
{
1567+
"alignItems": "flex-start",
1568+
"flexDirection": "row",
1569+
"flexWrap": "wrap",
1570+
"justifyContent": "flex-start",
15591571
"marginBottom": 8,
15601572
"marginTop": 8,
15611573
}

0 commit comments

Comments
 (0)