perf: close #909 reduce message items render time

This commit is contained in:
Yidadaa 2023-05-02 00:31:44 +08:00
parent 8f5c289818
commit a69cec89fb
2 changed files with 61 additions and 57 deletions

View File

@ -1,5 +1,5 @@
import { useDebouncedCallback } from "use-debounce"; import { useDebouncedCallback } from "use-debounce";
import { memo, useState, useRef, useEffect, useLayoutEffect } from "react"; import { useState, useRef, useEffect, useLayoutEffect } from "react";
import SendWhiteIcon from "../icons/send-white.svg"; import SendWhiteIcon from "../icons/send-white.svg";
import BrainIcon from "../icons/brain.svg"; import BrainIcon from "../icons/brain.svg";
@ -64,12 +64,9 @@ import {
useMaskStore, useMaskStore,
} from "../store/mask"; } from "../store/mask";
const Markdown = dynamic( const Markdown = dynamic(async () => (await import("./markdown")).Markdown, {
async () => memo((await import("./markdown")).Markdown), loading: () => <LoadingIcon />,
{ });
loading: () => <LoadingIcon />,
},
);
function exportMessages(messages: Message[], topic: string) { function exportMessages(messages: Message[], topic: string) {
const mdText = const mdText =

View File

@ -9,6 +9,7 @@ import { useRef, useState, RefObject, useEffect } from "react";
import { copyToClipboard } from "../utils"; import { copyToClipboard } from "../utils";
import LoadingIcon from "../icons/three-dots.svg"; import LoadingIcon from "../icons/three-dots.svg";
import React from "react";
export function PreCode(props: { children: any }) { export function PreCode(props: { children: any }) {
const ref = useRef<HTMLPreElement>(null); const ref = useRef<HTMLPreElement>(null);
@ -29,6 +30,32 @@ export function PreCode(props: { children: any }) {
); );
} }
function _MarkDownContent(props: { content: string }) {
return (
<ReactMarkdown
remarkPlugins={[RemarkMath, RemarkGfm, RemarkBreaks]}
rehypePlugins={[
RehypeKatex,
[
RehypeHighlight,
{
detect: false,
ignoreMissing: true,
},
],
]}
components={{
pre: PreCode,
}}
linkTarget={"_blank"}
>
{props.content}
</ReactMarkdown>
);
}
export const MarkdownContent = React.memo(_MarkDownContent);
export function Markdown( export function Markdown(
props: { props: {
content: string; content: string;
@ -38,69 +65,49 @@ export function Markdown(
} & React.DOMAttributes<HTMLDivElement>, } & React.DOMAttributes<HTMLDivElement>,
) { ) {
const mdRef = useRef<HTMLDivElement>(null); const mdRef = useRef<HTMLDivElement>(null);
const renderedHeight = useRef(0);
const inView = useRef(false);
const parent = props.parentRef.current; const parent = props.parentRef.current;
const md = mdRef.current; const md = mdRef.current;
const rendered = useRef(true); // disable lazy loading for bad ux
const [counter, setCounter] = useState(0);
useEffect(() => { if (parent && md) {
// to triggr rerender const parentBounds = parent.getBoundingClientRect();
setCounter(counter + 1); const twoScreenHeight = Math.max(500, parentBounds.height * 2);
// eslint-disable-next-line react-hooks/exhaustive-deps const mdBounds = md.getBoundingClientRect();
}, [props.loading]); const isInRange = (x: number) =>
x <= parentBounds.bottom + twoScreenHeight &&
x >= parentBounds.top - twoScreenHeight;
inView.current = isInRange(mdBounds.top) || isInRange(mdBounds.bottom);
}
const inView = if (inView.current && md) {
rendered.current || renderedHeight.current = Math.max(
(() => { renderedHeight.current,
if (parent && md) { md.getBoundingClientRect().height,
const parentBounds = parent.getBoundingClientRect(); );
const mdBounds = md.getBoundingClientRect(); }
const isInRange = (x: number) =>
x <= parentBounds.bottom && x >= parentBounds.top;
const inView = isInRange(mdBounds.top) || isInRange(mdBounds.bottom);
if (inView) {
rendered.current = true;
}
return inView;
}
})();
const shouldLoading = props.loading || !inView;
return ( return (
<div <div
className="markdown-body" className="markdown-body"
style={{ fontSize: `${props.fontSize ?? 14}px` }} style={{
fontSize: `${props.fontSize ?? 14}px`,
height:
!inView.current && renderedHeight.current > 0
? renderedHeight.current
: "auto",
}}
ref={mdRef} ref={mdRef}
onContextMenu={props.onContextMenu} onContextMenu={props.onContextMenu}
onDoubleClickCapture={props.onDoubleClickCapture} onDoubleClickCapture={props.onDoubleClickCapture}
> >
{shouldLoading ? ( {inView.current &&
<LoadingIcon /> (props.loading ? (
) : ( <LoadingIcon />
<ReactMarkdown ) : (
remarkPlugins={[RemarkMath, RemarkGfm, RemarkBreaks]} <MarkdownContent content={props.content} />
rehypePlugins={[ ))}
RehypeKatex,
[
RehypeHighlight,
{
detect: false,
ignoreMissing: true,
},
],
]}
components={{
pre: PreCode,
}}
linkTarget={"_blank"}
>
{props.content}
</ReactMarkdown>
)}
</div> </div>
); );
} }