Merge pull request #2789 from GetStream/fix/regex-max-stack-depth-crash

isekovanic · web-flow · commit 32115ca65203 · 2024-11-18T16:53:00.000+01:00
fix: regex max stack depth crash
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;
 };
diff --git a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap
@@ -475,9 +475,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                   }
                                 >
                                   <Text
-                                    numberOfLines={5}
                                     style={
                                       {
+                                        "alignItems": "flex-start",
+                                        "flexDirection": "row",
+                                        "flexWrap": "wrap",
+                                        "justifyContent": "flex-start",
                                         "marginBottom": 8,
                                         "marginTop": 8,
                                       }
@@ -823,9 +826,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                   }
                                 >
                                   <Text
-                                    numberOfLines={5}
                                     style={
                                       {
+                                        "alignItems": "flex-start",
+                                        "flexDirection": "row",
+                                        "flexWrap": "wrap",
+                                        "justifyContent": "flex-start",
                                         "marginBottom": 8,
                                         "marginTop": 8,
                                       }
@@ -1171,9 +1177,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                   }
                                 >
                                   <Text
-                                    numberOfLines={5}
                                     style={
                                       {
+                                        "alignItems": "flex-start",
+                                        "flexDirection": "row",
+                                        "flexWrap": "wrap",
+                                        "justifyContent": "flex-start",
                                         "marginBottom": 8,
                                         "marginTop": 8,
                                       }
@@ -1553,9 +1562,12 @@ exports[`Thread should match thread snapshot 1`] = `
                                       }
                                     >
                                       <Text
-                                        numberOfLines={5}
                                         style={
                                           {
+                                            "alignItems": "flex-start",
+                                            "flexDirection": "row",
+                                            "flexWrap": "wrap",
+                                            "justifyContent": "flex-start",
                                             "marginBottom": 8,
                                             "marginTop": 8,
                                           }

Original file line number	Diff line number	Diff line change
@@ -475,9 +475,12 @@ exports[`Thread should match thread snapshot 1`] = `
`475`	`475`	`}`
`476`	`476`	`>`
`477`	`477`	`<Text`
`478`		`- numberOfLines={5}`
`479`	`478`	`style={`
`480`	`479`	`{`
	`480`	`+ "alignItems": "flex-start",`
	`481`	`+ "flexDirection": "row",`
	`482`	`+ "flexWrap": "wrap",`
	`483`	`+ "justifyContent": "flex-start",`
`481`	`484`	`"marginBottom": 8,`
`482`	`485`	`"marginTop": 8,`
`483`	`486`	`}`
@@ -823,9 +826,12 @@ exports[`Thread should match thread snapshot 1`] = `
`823`	`826`	`}`
`824`	`827`	`>`
`825`	`828`	`<Text`
`826`		`- numberOfLines={5}`
`827`	`829`	`style={`
`828`	`830`	`{`
	`831`	`+ "alignItems": "flex-start",`
	`832`	`+ "flexDirection": "row",`
	`833`	`+ "flexWrap": "wrap",`
	`834`	`+ "justifyContent": "flex-start",`
`829`	`835`	`"marginBottom": 8,`
`830`	`836`	`"marginTop": 8,`
`831`	`837`	`}`
@@ -1171,9 +1177,12 @@ exports[`Thread should match thread snapshot 1`] = `
`1171`	`1177`	`}`
`1172`	`1178`	`>`
`1173`	`1179`	`<Text`
`1174`		`- numberOfLines={5}`
`1175`	`1180`	`style={`
`1176`	`1181`	`{`
	`1182`	`+ "alignItems": "flex-start",`
	`1183`	`+ "flexDirection": "row",`
	`1184`	`+ "flexWrap": "wrap",`
	`1185`	`+ "justifyContent": "flex-start",`
`1177`	`1186`	`"marginBottom": 8,`
`1178`	`1187`	`"marginTop": 8,`
`1179`	`1188`	`}`
@@ -1553,9 +1562,12 @@ exports[`Thread should match thread snapshot 1`] = `
`1553`	`1562`	`}`
`1554`	`1563`	`>`
`1555`	`1564`	`<Text`
`1556`		`- numberOfLines={5}`
`1557`	`1565`	`style={`
`1558`	`1566`	`{`
	`1567`	`+ "alignItems": "flex-start",`
	`1568`	`+ "flexDirection": "row",`
	`1569`	`+ "flexWrap": "wrap",`
	`1570`	`+ "justifyContent": "flex-start",`
`1559`	`1571`	`"marginBottom": 8,`
`1560`	`1572`	`"marginTop": 8,`
`1561`	`1573`	`}`