Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): upgrade react-markdown to v9 #2643

Merged
merged 2 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@
"react-dropzone": "^14.2.3",
"react-fast-compare": "^3.2.2",
"react-image-gallery": "1.2.12",
"react-markdown": "^8.0.7",
"react-markdown": "^9.0.3",
"react-player": "2.10.1",
"react-popper": "^2.3.0",
"react-textarea-autosize": "^8.3.0",
"react-virtuoso": "^2.16.5",
"remark-gfm": "^3.0.1",
"remark-gfm": "^4.0.1",
"textarea-caret": "^3.1.0",
"tslib": "^2.6.2",
"unist-builder": "^3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ exports[`keepLineBreaksPlugin present keeps line breaks around a blockquote 1`]


<blockquote>


<p>
b
</p>
Expand Down Expand Up @@ -556,6 +558,8 @@ exports[`keepLineBreaksPlugin present keeps line breaks between the items in an


<li>


<p>
item 2
</p>
Expand All @@ -579,6 +583,8 @@ exports[`keepLineBreaksPlugin present keeps line breaks between the items in an


<li>


<p>
item 3
</p>
Expand Down Expand Up @@ -622,6 +628,8 @@ exports[`keepLineBreaksPlugin present keeps line breaks between the items in an


<li>


<p>
item 2
</p>
Expand All @@ -645,6 +653,8 @@ exports[`keepLineBreaksPlugin present keeps line breaks between the items in an


<li>


<p>
item 3
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { u } from 'unist-builder';
import { visit } from 'unist-util-visit';

import type { Nodes } from 'hast-util-find-and-replace/lib';
import type { Element } from 'react-markdown/lib/ast-to-react';
import type { Element } from 'hast';
import type { UserResponse } from 'stream-chat';
import type { DefaultStreamChatGenerics } from '../../../../types';

Expand Down
13 changes: 7 additions & 6 deletions src/components/Message/renderText/renderText.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import React, { ComponentType } from 'react';
import ReactMarkdown, { Options, uriTransformer } from 'react-markdown';
import ReactMarkdown, { defaultUrlTransform } from 'react-markdown';
import { find } from 'linkifyjs';
import uniqBy from 'lodash.uniqby';
import remarkGfm from 'remark-gfm';

import type { PluggableList } from 'react-markdown/lib/react-markdown';
import type { UserResponse } from 'stream-chat';

import { Anchor, Emoji, Mention, MentionProps } from './componentRenderers';
import { detectHttp, escapeRegExp, matchMarkdownLinks, messageCodeBlocks } from './regex';
import { emojiMarkdownPlugin, mentionsMarkdownPlugin } from './rehypePlugins';
import { htmlToTextPlugin, keepLineBreaksPlugin } from './remarkPlugins';
import { ErrorBoundary } from '../../UtilityComponents';

import type { Options } from 'react-markdown/lib';
import type { UserResponse } from 'stream-chat';
import type { PluggableList } from 'unified'; // A subdependency of react-markdown. The type is not declared or re-exported from anywhere else

import type { DefaultStreamChatGenerics } from '../../../types/types';

export type RenderTextPluginConfigurator = (
Expand Down Expand Up @@ -65,7 +66,7 @@ function encodeDecode(url: string) {
}

const urlTransform = (uri: string) =>
uri.startsWith('app://') ? uri : uriTransformer(uri);
uri.startsWith('app://') ? uri : defaultUrlTransform(uri);

const getPluginsForward: RenderTextPluginConfigurator = (plugins: PluggableList) =>
plugins;
Expand Down Expand Up @@ -189,8 +190,8 @@ export const renderText = <
rehypePlugins={getRehypePlugins(rehypePlugins)}
remarkPlugins={getRemarkPlugins(remarkPlugins)}
skipHtml
transformLinkUri={urlTransform}
unwrapDisallowed
urlTransform={urlTransform}
>
{newText}
</ReactMarkdown>
Expand Down
Loading
Loading