mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-18 01:10:14 +01:00
* 🔧 fix: Handle optional arguments in `useParseArgs` and improve tool call condition
* chore: Remove math plugins from `MarkdownLite`
* ✨ feat: Add Error Boundary to Markdown Component for Enhanced Error Handling
- Introduced `MarkdownErrorBoundary` to catch and display errors during Markdown rendering.
- Updated the `Markdown` component to utilize the new error boundary, improving user experience by handling rendering issues gracefully.
* Revert "chore: Remove math plugins from `MarkdownLite`"
This reverts commit d393099d52.
* ✨ feat: Introduce MarkdownErrorBoundary for improved error handling in Markdown components
* refactor: include most markdown elements in error boundary fallback, aside from problematic plugins
90 lines
2.2 KiB
TypeScript
90 lines
2.2 KiB
TypeScript
import React from 'react';
|
|
import remarkGfm from 'remark-gfm';
|
|
import supersub from 'remark-supersub';
|
|
import ReactMarkdown from 'react-markdown';
|
|
import rehypeHighlight from 'rehype-highlight';
|
|
import type { PluggableList } from 'unified';
|
|
import { code, codeNoExecution, a, p } from './Markdown';
|
|
import { CodeBlockProvider } from '~/Providers';
|
|
import { langSubset } from '~/utils';
|
|
|
|
interface ErrorBoundaryState {
|
|
hasError: boolean;
|
|
error?: Error;
|
|
}
|
|
|
|
interface MarkdownErrorBoundaryProps {
|
|
children: React.ReactNode;
|
|
content: string;
|
|
codeExecution?: boolean;
|
|
}
|
|
|
|
class MarkdownErrorBoundary extends React.Component<
|
|
MarkdownErrorBoundaryProps,
|
|
ErrorBoundaryState
|
|
> {
|
|
constructor(props: MarkdownErrorBoundaryProps) {
|
|
super(props);
|
|
this.state = { hasError: false };
|
|
}
|
|
|
|
static getDerivedStateFromError(error: Error): ErrorBoundaryState {
|
|
return { hasError: true, error };
|
|
}
|
|
|
|
componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
|
|
console.error('Markdown rendering error:', error, errorInfo);
|
|
}
|
|
|
|
componentDidUpdate(prevProps: MarkdownErrorBoundaryProps) {
|
|
if (prevProps.content !== this.props.content && this.state.hasError) {
|
|
this.setState({ hasError: false, error: undefined });
|
|
}
|
|
}
|
|
|
|
render() {
|
|
if (this.state.hasError) {
|
|
const { content, codeExecution = true } = this.props;
|
|
|
|
const rehypePlugins: PluggableList = [
|
|
[
|
|
rehypeHighlight,
|
|
{
|
|
detect: true,
|
|
ignoreMissing: true,
|
|
subset: langSubset,
|
|
},
|
|
],
|
|
];
|
|
|
|
return (
|
|
<CodeBlockProvider>
|
|
<ReactMarkdown
|
|
remarkPlugins={[
|
|
/** @ts-ignore */
|
|
supersub,
|
|
remarkGfm,
|
|
]}
|
|
/** @ts-ignore */
|
|
rehypePlugins={rehypePlugins}
|
|
components={
|
|
{
|
|
code: codeExecution ? code : codeNoExecution,
|
|
a,
|
|
p,
|
|
} as {
|
|
[nodeType: string]: React.ElementType;
|
|
}
|
|
}
|
|
>
|
|
{content}
|
|
</ReactMarkdown>
|
|
</CodeBlockProvider>
|
|
);
|
|
}
|
|
|
|
return this.props.children;
|
|
}
|
|
}
|
|
|
|
export default MarkdownErrorBoundary;
|