usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-10-09 22:06:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: avoid content flash on auto collapse (#2042)

Browse source
This commit is contained in:
Gerald 2023-07-29 09:04:34 +08:00 • committed by GitHub
parent 95675cdf07
commit 28aecd86d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/src/components/MemoContent.tsx
View file

@ -30,22 +30,22 @@ const MemoContent: React.FC<Props> = (props: Props) => {
});
const memoContentContainerRef = useRef<HTMLDivElement>(null);
const isVisitorMode = userStore.isVisitorMode();
const autoCollapse: boolean = isVisitorMode ? true : (userStore.state.user as User).localSetting.enableAutoCollapse;
const autoCollapse: boolean = !showFull && (isVisitorMode ? true : (userStore.state.user as User).localSetting.enableAutoCollapse);
useEffect(() => {
if (showFull) {
if (!autoCollapse) {
return;
}
if (memoContentContainerRef.current) {
const height = memoContentContainerRef.current.clientHeight;
const height = memoContentContainerRef.current.scrollHeight;
if (height > MAX_EXPAND_HEIGHT) {
setState({
expandButtonStatus: 0,
});
}
}
}, []);
}, [autoCollapse]);
const handleMemoContentClick = async (e: React.MouseEvent) => {
if (onMemoContentClick) {
@ -70,7 +70,7 @@ const MemoContent: React.FC<Props> = (props: Props) => {
<div className={`memo-content-wrapper ${className || ""}`}>
<div
ref={memoContentContainerRef}
className={`memo-content-text ${autoCollapse && state.expandButtonStatus === 0 ? "max-h-64 overflow-y-hidden" : ""}`}
className={`memo-content-text ${autoCollapse && state.expandButtonStatus < 1 ? "max-h-64 overflow-y-hidden" : ""}`}
onClick={handleMemoContentClick}
onDoubleClick={handleMemoContentDoubleClick}
>