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: share memo with resource list (#431)

Zeng1998b6c0a0439480
diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsx
index 58918c43e..4e4deb6a1 100644
--- a/web/src/components/MemoResources.tsx
+++ b/web/src/components/MemoResources.tsx
@@ -22,7 +22,7 @@ const MemoResources: React.FC<Props> = (props: Props) => {
});
return (
- <div className={`resource-wrapper ${className || ""}`}>
+ <div className={`resource-wrapper ${className || ""}`}>
{imageList.length > 0 && (
<div className="images-wrapper">
{imageList.map((resource, index) => (
diff --git a/web/src/components/ShareMemoImageDialog.tsx b/web/src/components/ShareMemoImageDialog.tsx
index 4a3833af2..973be3949 100644
--- a/web/src/components/ShareMemoImageDialog.tsx
+++ b/web/src/components/ShareMemoImageDialog.tsx
@@ -8,6 +8,7 @@ import Icon from "./Icon";
import { generateDialog } from "./Dialog";
import MemoContent from "./MemoContent";
import "../less/share-memo-image-dialog.less";
+import MemoResources from "./MemoResources";
interface Props extends DialogProps {
memo: Memo;
@@ -72,7 +73,10 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
<div className="memo-container" ref={memoElRef}>
{shortcutImgUrl !== "" && <img className="memo-shortcut-img" onClick={handleDownloadBtnClick} src={shortcutImgUrl} />}
<span className="time-text">{memo.createdAtStr}</span>
- <MemoContent className="memo-content-wrapper" content={memo.content} displayConfig={{ enableExpand: false }} />
+ <div className="memo-content-wrapper">
+ <MemoContent content={memo.content} displayConfig={{ enableExpand: false }} />
+ <MemoResources resourceList={memo.resourceList} />
+ </div>
<div className="watermark-container">
<span className="normal-text">
<span className="icon-text">✍️</span> by <span className="name-text">{userinfo?.name}</span>