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.

feat: fold memo when content overflow (#1327)

boojackccdcd3d1549a
diff --git a/web/src/components/DailyMemo.tsx b/web/src/components/DailyMemo.tsx
index 1555b7661..93aec3145 100644
--- a/web/src/components/DailyMemo.tsx
+++ b/web/src/components/DailyMemo.tsx
@@ -1,5 +1,5 @@
import * as utils from "../helpers/utils";
-import MemoContent, { DisplayConfig } from "./MemoContent";
+import MemoContent from "./MemoContent";
import MemoResources from "./MemoResources";
import "../less/daily-memo.less";
@@ -10,9 +10,6 @@ interface Props {
const DailyMemo: React.FC<Props> = (props: Props) => {
const { memo } = props;
const createdTimeStr = utils.getTimeString(memo.createdTs);
- const displayConfig: DisplayConfig = {
- enableExpand: false,
- };
return (
<div className="daily-memo-wrapper">
@@ -20,7 +17,7 @@ const DailyMemo: React.FC<Props> = (props: Props) => {
<span className="normal-text">{createdTimeStr}</span>
</div>
<div className="memo-container">
- <MemoContent content={memo.content} displayConfig={displayConfig} />
+ <MemoContent content={memo.content} showFull={true} />
<MemoResources resourceList={memo.resourceList} />
</div>
<div className="split-line"></div>
diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsx
index dda7b2442..caec39df0 100644
--- a/web/src/components/Memo.tsx
+++ b/web/src/components/Memo.tsx
@@ -1,4 +1,3 @@
-import { Tooltip } from "@mui/joy";
import copy from "copy-to-clipboard";
import dayjs from "dayjs";
import { memo, useEffect, useRef, useState } from "react";
@@ -39,7 +38,6 @@ const Memo: React.FC<Props> = (props: Props) => {
const [createdTimeStr, setCreatedTimeStr] = useState<string>(getFormatedMemoTimeStr(memo.createdTs, i18n.language));
const memoContainerRef = useRef<HTMLDivElement>(null);
const isVisitorMode = userStore.isVisitorMode() || readonly;
- const updatedTimeStr = getFormatedMemoTimeStr(memo.updatedTs, i18n.language);
useEffect(() => {
let intervalFlag: any = -1;
@@ -111,7 +109,7 @@ const Memo: React.FC<Props> = (props: Props) => {
}
};
- const handleGenMemoImageBtnClick = () => {
+ const handleGenerateMemoImageBtnClick = () => {
showShareMemo(memo);
};
@@ -203,11 +201,9 @@ const Memo: React.FC<Props> = (props: Props) => {
{memo.pinned && <div className="corner-container"></div>}
<div className="memo-top-wrapper">
<div className="status-text-container">
- <Tooltip title={`Updated at ${updatedTimeStr}`} placement="top" arrow>
- <span className="time-text" onDoubleClick={handleMemoCreatedTimeClick}>
- {createdTimeStr}
- </span>
- </Tooltip>
+ <span className="time-text" onDoubleClick={handleMemoCreatedTimeClick}>
+ {createdTimeStr}
+ </span>
{isVisitorMode && (
<a className="name-text" href={`/u/${memo.creatorId}`}>
@{memo.creatorName}
@@ -238,7 +234,7 @@ const Memo: React.FC<Props> = (props: Props) => {
<Icon.Edit3 className="icon-img" />
<span className="tip-text">{t("common.edit")}</span>
</div>
- <div className="btn" onClick={handleGenMemoImageBtnClick}>
+ <div className="btn" onClick={handleGenerateMemoImageBtnClick}>
<Icon.Share className="icon-img" />
<span className="tip-text">{t("common.share")}</span>
</div>
diff --git a/web/src/components/MemoContent.tsx b/web/src/components/MemoContent.tsx
index c43819cb1..300681fe9 100644
--- a/web/src/components/MemoContent.tsx
+++ b/web/src/components/MemoContent.tsx
@@ -1,18 +1,15 @@
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
-import { useUserStore } from "../store/module";
import { marked } from "../labs/marked";
import Icon from "./Icon";
import "../less/memo-content.less";
-export interface DisplayConfig {
- enableExpand: boolean;
-}
+const MAX_EXPAND_HEIGHT = 384;
interface Props {
content: string;
className?: string;
- displayConfig?: Partial<DisplayConfig>;
+ showFull?: boolean;
onMemoContentClick?: (e: React.MouseEvent) => void;
onMemoContentDoubleClick?: (e: React.MouseEvent) => void;
}
@@ -23,48 +20,29 @@ interface State {
expandButtonStatus: ExpandButtonStatus;
}
-const defaultDisplayConfig: DisplayConfig = {
- enableExpand: true,
-};
-
const MemoContent: React.FC<Props> = (props: Props) => {
- const { className, content, onMemoContentClick, onMemoContentDoubleClick } = props;
+ const { className, content, showFull, onMemoContentClick, onMemoContentDoubleClick } = props;
const { t } = useTranslation();
- const userStore = useUserStore();
- const user = userStore.state.user;
- const foldedContent = useMemo(() => {
- const firstHorizontalRuleIndex = content.search(/^---$|^\*\*\*$|^___$/m);
- return firstHorizontalRuleIndex !== -1 ? content.slice(0, firstHorizontalRuleIndex) : content;
- }, [content]);
const [state, setState] = useState<State>({
expandButtonStatus: -1,
});
const memoContentContainerRef = useRef<HTMLDivElement>(null);
- const displayConfig = {
- ...defaultDisplayConfig,
- ...props.displayConfig,
- };
useEffect(() => {
- if (!memoContentContainerRef) {
+ if (showFull) {
return;
}
- if (displayConfig.enableExpand && user && user.localSetting.enableFoldMemo) {
- if (foldedContent.length !== content.length) {
+ if (memoContentContainerRef.current) {
+ const height = memoContentContainerRef.current.clientHeight;
+ if (height > MAX_EXPAND_HEIGHT) {
setState({
- ...state,
expandButtonStatus: 0,
});
}
- } else {
- setState({
- ...state,
- expandButtonStatus: -1,
- });
}
- }, [user?.localSetting.enableFoldMemo, content]);
+ }, []);
const handleMemoContentClick = async (e: React.MouseEvent) => {
if (onMemoContentClick) {
@@ -89,17 +67,18 @@ const MemoContent: React.FC<Props> = (props: Props) => {
<div className={`memo-content-wrapper ${className || ""}`}>
<div
ref={memoContentContainerRef}
- className={`memo-content-text ${state.expandButtonStatus === 0 ? "expanded" : ""}`}
+ className={`memo-content-text ${state.expandButtonStatus === 0 ? "max-h-64 overflow-y-hidden" : ""}`}
onClick={handleMemoContentClick}
onDoubleClick={handleMemoContentDoubleClick}
>
- {marked(state.expandButtonStatus === 0 ? foldedContent : content)}
+ {marked(content)}
</div>
{state.expandButtonStatus !== -1 && (
- <div className="expand-btn-container">
- <span className={`btn ${state.expandButtonStatus === 0 ? "expand-btn" : "fold-btn"}`} onClick={handleExpandBtnClick}>
+ <div className={`expand-btn-container ${state.expandButtonStatus === 0 && "!-mt-7"}`}>
+ <div className="absolute top-0 left-0 w-full h-full blur-lg bg-white"></div>
+ <span className={`btn z-10 ${state.expandButtonStatus === 0 ? "expand-btn" : "fold-btn"}`} onClick={handleExpandBtnClick}>
{state.expandButtonStatus === 0 ? t("common.expand") : t("common.fold")}
- <Icon.ChevronRight className="icon-img" />
+ <Icon.ChevronRight className="icon-img opacity-80" />
</span>
</div>
)}
diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsx
index d88101f98..e9106f69a 100644
--- a/web/src/components/Settings/PreferencesSection.tsx
+++ b/web/src/components/Settings/PreferencesSection.tsx
@@ -40,10 +40,6 @@ const PreferencesSection = () => {
await userStore.upsertUserSetting("resourceVisibility", value);
};
- const handleIsFoldingEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
- userStore.upsertLocalSetting({ ...localSetting, enableFoldMemo: event.target.checked });
- };
-
const handleDoubleClickEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
userStore.upsertLocalSetting({ ...localSetting, enableDoubleClickEditing: event.target.checked });
};
@@ -131,10 +127,6 @@ const PreferencesSection = () => {
</span>
</div>
- <label className="form-label selector">
- <span className="normal-text">{t("setting.preference-section.enable-folding-memo")}</span>
- <Switch className="ml-2" checked={localSetting.enableFoldMemo} onChange={handleIsFoldingEnabledChanged} />
- </label>
<label className="form-label selector">
<span className="normal-text">{t("setting.preference-section.enable-double-click")}</span>
<Switch className="ml-2" checked={localSetting.enableDoubleClickEditing} onChange={handleDoubleClickEnabledChanged} />
diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx
index 8c09917f9..306c7d019 100644
--- a/web/src/components/ShareMemoDialog.tsx
+++ b/web/src/components/ShareMemoDialog.tsx
@@ -126,7 +126,7 @@ const ShareMemoDialog: React.FC<Props> = (props: Props) => {
<div className="memo-container" ref={memoElRef}>
<span className="time-text">{memo.createdAtStr}</span>
<div className="memo-content-wrapper">
- <MemoContent content={memo.content} displayConfig={{ enableExpand: false }} />
+ <MemoContent content={memo.content} showFull={true} />
<MemoResources resourceList={memo.resourceList} />
</div>
<div className="watermark-container">
diff --git a/web/src/less/memo-content.less b/web/src/less/memo-content.less
index a8fd23bfa..15bda7c6b 100644
--- a/web/src/less/memo-content.less
+++ b/web/src/less/memo-content.less
@@ -110,11 +110,9 @@
@apply w-full relative flex flex-row justify-start items-center;
> .btn {
- @apply flex flex-row justify-start items-center pl-2 pr-1 py-1 my-1 text-xs rounded-lg border bg-gray-100 dark:bg-zinc-600 border-gray-200 dark:border-zinc-600 opacity-80 shadow hover:opacity-60 cursor-pointer;
+ @apply flex flex-row justify-start items-center pl-2 pr-1 py-1 my-2 text-xs rounded-lg border bg-gray-100 dark:bg-zinc-600 border-gray-200 dark:border-zinc-600 shadow hover:opacity-90 cursor-pointer;
&.expand-btn {
- @apply mt-2;
-
> .icon-img {
@apply rotate-90;
}
diff --git a/web/src/store/module/user.ts b/web/src/store/module/user.ts
index 9a03e47db..beadd828f 100644
--- a/web/src/store/module/user.ts
+++ b/web/src/store/module/user.ts
@@ -14,7 +14,6 @@ const defaultSetting: Setting = {
};
const defaultLocalSetting: LocalSetting = {
- enableFoldMemo: true,
enableDoubleClickEditing: true,
dailyReviewTimeOffset: 0,
};
diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.ts
index 5168a9701..18c15cc8f 100644
--- a/web/src/types/modules/setting.d.ts
+++ b/web/src/types/modules/setting.d.ts
@@ -8,7 +8,6 @@ interface Setting {
}
interface LocalSetting {
- enableFoldMemo: boolean;
enableDoubleClickEditing: boolean;
dailyReviewTimeOffset: number;
}