Merge branch 'master' into 4.1.0-changelog

Author: DanC5

src/components/MessageList/MessageList.js

@@ -166,7 +166,7 @@ class MessageList extends PureComponent {
     this.setState({ newMessagesNotification: false });
   };
 
-  userScrolledUp = () => this.scrollOffset > 200;
+  userScrolledUp = () => this.scrollOffset > this.props.scrolledUpThreshold;
 
   listenToScroll = (offset, reverseOffset, threshold) => {
     this.scrollOffset = offset;
@@ -455,6 +455,8 @@ MessageList.propTypes = {
    * The user roles allowed to pin messages in various channel types
    */
   pinPermissions: /** @type {PropTypes.Validator<import('types').PinPermissions>>} */ (PropTypes.object),
+  /** The pixel threshold to determine whether or not the user is scrolled up in the list */
+  scrolledUpThreshold: PropTypes.number,
 };
 
 MessageList.defaultProps = {
@@ -471,6 +473,7 @@ MessageList.defaultProps = {
   noGroupByUser: false,
   messageActions: Object.keys(MESSAGE_ACTIONS),
   pinPermissions: defaultPinPermissions,
+  scrolledUpThreshold: 200,
 };
 
 export default withTranslationContext((props) => (

src/utils.js

@@ -59,6 +59,13 @@ const matchMarkdownLinks = (message) => {
   return links;
 };
 
+/** @type {(message: string) => (string|null)[]} */
+const messageCodeBlocks = (message) => {
+  const codeRegex = /```[a-z]*\n[\s\S]*?\n```|`[a-z]*[\s\S]*?`/gm;
+  const matches = message.match(codeRegex);
+  return matches || [];
+};
+
 /** @type {(input: string, length: number) => string} */
 export const truncate = (input, length, end = '...') => {
   if (input.length > length) {
@@ -93,13 +100,15 @@ export const renderText = (text, mentioned_users) => {
 
   let newText = text;
   let markdownLinks = matchMarkdownLinks(newText);
+  let codeBlocks = messageCodeBlocks(newText);
   // extract all valid links/emails within text and replace it with proper markup
   linkify.find(newText).forEach(({ type, href, value }) => {
+    const linkIsInBlock = codeBlocks.some((block) => block?.includes(value));
     // check if message is already  markdown
     const noParsingNeeded =
       markdownLinks &&
       markdownLinks.filter((text) => text?.indexOf(href) !== -1);
-    if (noParsingNeeded.length > 0) return;
+    if (noParsingNeeded.length > 0 || linkIsInBlock) return;
 
     const displayLink =
       type === 'email'

types/index.d.ts

@@ -673,6 +673,7 @@ export interface MessageListProps {
     e: React.MouseEvent,
     mentioned_users: Client.UserResponse[],
   ): void;
+  scrolledUpThreshold?: number;
 }
 
 export interface ChannelHeaderProps {