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.

chore: fix memo content click handler

Stevenc60c58ed69aa
diff --git a/web/src/components/ArchivedMemo.tsx b/web/src/components/ArchivedMemo.tsx
index 11ccb6c52..01d8666ea 100644
--- a/web/src/components/ArchivedMemo.tsx
+++ b/web/src/components/ArchivedMemo.tsx
@@ -72,7 +72,7 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
</span>
</div>
</div>
- <MemoContent className="memo-content-wrapper" content={memo.content} />
+ <MemoContent content={memo.content} />
<MemoResources memo={memo} />
</div>
);
diff --git a/web/src/components/DailyMemo.tsx b/web/src/components/DailyMemo.tsx
index 9799b45d2..84085a48d 100644
--- a/web/src/components/DailyMemo.tsx
+++ b/web/src/components/DailyMemo.tsx
@@ -28,7 +28,7 @@ const DailyMemo: React.FC<Props> = (props: Props) => {
<div className="time-wrapper">
<span className="normal-text">{memo.timeStr}</span>
</div>
- <MemoContent className="memo-content-container" content={memo.content} displayConfig={displayConfig} />
+ <MemoContent content={memo.content} displayConfig={displayConfig} />
<div className="split-line"></div>
</div>
);
diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsx
index a6a13da05..318b62098 100644
--- a/web/src/components/Memo.tsx
+++ b/web/src/components/Memo.tsx
@@ -35,7 +35,6 @@ const Memo: React.FC<Props> = (props: Props) => {
const { t, i18n } = useTranslation();
const [createdAtStr, setCreatedAtStr] = useState<string>(getFormatedMemoCreatedAtStr(memo.createdTs, i18n.language));
const memoContainerRef = useRef<HTMLDivElement>(null);
- const memoContentContainerRef = useRef<HTMLDivElement>(null);
const isVisitorMode = userService.isVisitorMode();
useEffect(() => {
@@ -122,7 +121,7 @@ const Memo: React.FC<Props> = (props: Props) => {
}
const status = targetEl.dataset?.value;
- const todoElementList = [...(memoContentContainerRef.current?.querySelectorAll(`span.todo-block[data-value=${status}]`) ?? [])];
+ const todoElementList = [...(memoContainerRef.current?.querySelectorAll(`span.todo-block[data-value=${status}]`) ?? [])];
for (const element of todoElementList) {
if (element === targetEl) {
const index = indexOf(todoElementList, element);
@@ -207,7 +206,6 @@ const Memo: React.FC<Props> = (props: Props) => {
</div>
</div>
<MemoContent
- className=""
content={memo.content}
onMemoContentClick={handleMemoContentClick}
onMemoContentDoubleClick={handleMemoContentDoubleClick}
diff --git a/web/src/components/MemoCardDialog.tsx b/web/src/components/MemoCardDialog.tsx
index 76daafa5e..a38b7204b 100644
--- a/web/src/components/MemoCardDialog.tsx
+++ b/web/src/components/MemoCardDialog.tsx
@@ -178,12 +178,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
</div>
</div>
<div className="memo-container">
- <MemoContent
- className=""
- displayConfig={{ enableExpand: false }}
- content={memo.content}
- onMemoContentClick={handleMemoContentClick}
- />
+ <MemoContent displayConfig={{ enableExpand: false }} content={memo.content} onMemoContentClick={handleMemoContentClick} />
<MemoResources memo={memo} />
</div>
<div className="layer-container"></div>
diff --git a/web/src/components/MemoContent.tsx b/web/src/components/MemoContent.tsx
index 20f28f808..af3065c2e 100644
--- a/web/src/components/MemoContent.tsx
+++ b/web/src/components/MemoContent.tsx
@@ -14,8 +14,8 @@ export interface DisplayConfig {
}
interface Props {
- className: string;
content: string;
+ className?: string;
displayConfig?: Partial<DisplayConfig>;
onMemoContentClick?: (e: React.MouseEvent) => void;
onMemoContentDoubleClick?: (e: React.MouseEvent) => void;
@@ -78,7 +78,7 @@ const MemoContent: React.FC<Props> = (props: Props) => {
};
return (
- <div className={`memo-content-wrapper ${className}`}>
+ <div className={`memo-content-wrapper ${className || ""}`}>
<div
ref={memoContentContainerRef}
className={`memo-content-text ${state.expandButtonStatus === 0 ? "expanded" : ""}`}
diff --git a/web/src/less/memo-content.less b/web/src/less/memo-content.less
index 24aa9442c..ab71b1d9f 100644
--- a/web/src/less/memo-content.less
+++ b/web/src/less/memo-content.less
@@ -22,7 +22,7 @@
}
.tag-span {
- @apply inline-block w-auto font-mono text-blue-600;
+ @apply inline-block w-auto font-mono text-blue-600 cursor-pointer;
}
.memo-link-text {