Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

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

Gerald28aecd86d351
diff --git a/web/src/components/MemoContent.tsx b/web/src/components/MemoContent.tsx
index bce5e6907..da78d05e4 100644
--- a/web/src/components/MemoContent.tsx
+++ b/web/src/components/MemoContent.tsx
@@ -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}
>