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: image preview enhancement (#385)

Zeng19984246232fbeb3
diff --git a/web/src/components/Image.tsx b/web/src/components/Image.tsx
index 16df3e483..85881ef5b 100644
--- a/web/src/components/Image.tsx
+++ b/web/src/components/Image.tsx
@@ -1,21 +1,22 @@
-import showPreviewImageDialog from "./PreviewImageDialog";
+import showPreviewImageCarouselDialog from "./PreviewImageCarouselDialog";
import "../less/image.less";
interface Props {
- imgUrl: string;
+ imgUrls: string[];
+ index: number;
className?: string;
}
const Image: React.FC<Props> = (props: Props) => {
- const { className, imgUrl } = props;
+ const { className, imgUrls, index } = props;
const handleImageClick = () => {
- showPreviewImageDialog(imgUrl);
+ showPreviewImageCarouselDialog(imgUrls, index);
};
return (
<div className={"image-container " + className} onClick={handleImageClick}>
- <img src={imgUrl} decoding="async" loading="lazy" />
+ <img src={imgUrls[index]} decoding="async" loading="lazy" />
</div>
);
};
diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsx
index 160b8dd35..e8aee8dc1 100644
--- a/web/src/components/MemoResources.tsx
+++ b/web/src/components/MemoResources.tsx
@@ -16,12 +16,16 @@ const MemoResources: React.FC<Props> = (props: Props) => {
window.open(resourceUrl);
};
+ const imgUrls = imageList.map((resource) => {
+ return `/o/r/${resource.id}/${resource.filename}`;
+ });
+
return (
<div className="resource-wrapper">
{imageList.length > 0 && (
<div className="images-wrapper">
- {imageList.map((resource) => (
- <Image className="memo-img" key={resource.id} imgUrl={`/o/r/${resource.id}/${resource.filename}`} />
+ {imageList.map((resource, index) => (
+ <Image className="memo-img" key={resource.id} imgUrls={imgUrls} index={index} />
))}
</div>
)}
diff --git a/web/src/components/PreviewImageCarouselDialog.tsx b/web/src/components/PreviewImageCarouselDialog.tsx
new file mode 100644
index 000000000..faaba1308
--- /dev/null
+++ b/web/src/components/PreviewImageCarouselDialog.tsx
@@ -0,0 +1,76 @@
+import * as utils from "../helpers/utils";
+import Icon from "./Icon";
+import { generateDialog } from "./Dialog";
+import "../less/preview-image-carousel-dialog.less";
+
+interface Props extends DialogProps {
+ imgUrls: string[];
+ index: number;
+}
+
+const PreviewImageDialog: React.FC<Props> = ({ destroy, imgUrls, index }: Props) => {
+ const handleCloseBtnClick = () => {
+ destroy();
+ };
+
+ const handleDownloadBtnClick = () => {
+ const a = document.createElement("a");
+ a.href = imgUrls[index];
+ a.download = `memos-${utils.getDateTimeString(Date.now())}.png`;
+ a.click();
+ };
+
+ const handleImgContainerClick = () => {
+ destroy();
+ };
+
+ const handlePrevBtnClick = () => {
+ destroy();
+ if (index > 0) {
+ showPreviewImageCarouselDialog(imgUrls, index - 1);
+ } else {
+ showPreviewImageCarouselDialog(imgUrls, imgUrls.length - 1);
+ }
+ };
+
+ const handleNextBtnClick = () => {
+ destroy();
+ if (index < imgUrls.length - 1) {
+ showPreviewImageCarouselDialog(imgUrls, index + 1);
+ } else {
+ showPreviewImageCarouselDialog(imgUrls, 0);
+ }
+ };
+
+ return (
+ <>
+ <div className="btns-container">
+ <button className="btn" onClick={handleCloseBtnClick}>
+ <Icon.X className="icon-img" />
+ </button>
+ <button className="btn" onClick={handleDownloadBtnClick}>
+ <Icon.Download className="icon-img" />
+ </button>
+ <button className="btn" onClick={handlePrevBtnClick}>
+ <Icon.ArrowLeft className="icon-img" />
+ </button>
+ <button className="btn" onClick={handleNextBtnClick}>
+ <Icon.ArrowRight className="icon-img" />
+ </button>
+ </div>
+ <div className="img-container" onClick={handleImgContainerClick}>
+ <img onClick={(e) => e.stopPropagation()} src={imgUrls[index]} />
+ </div>
+ </>
+ );
+};
+
+export default function showPreviewImageCarouselDialog(imgUrls: string[], index: number): void {
+ generateDialog(
+ {
+ className: "preview-image-carousel-dialog",
+ },
+ PreviewImageDialog,
+ { imgUrls, index }
+ );
+}
diff --git a/web/src/less/preview-image-carousel-dialog.less b/web/src/less/preview-image-carousel-dialog.less
new file mode 100644
index 000000000..e3a54cd2c
--- /dev/null
+++ b/web/src/less/preview-image-carousel-dialog.less
@@ -0,0 +1,34 @@
+@import "./mixin.less";
+
+.preview-image-carousel-dialog {
+ @apply p-0;
+ z-index: 101;
+ background-color: rgba(0, 0, 0, 0.6);
+
+ > .dialog-container {
+ @apply flex flex-col justify-center items-center relative w-full h-full p-0;
+ background-color: unset;
+
+ > .btns-container {
+ @apply fixed top-8 right-8 flex flex-col justify-start items-center;
+
+ > .btn {
+ @apply mb-3 last:mb-0 w-8 h-8 p-1 cursor-pointer rounded opacity-90 bg-gray-300 z-10 shadow-md hover:opacity-70;
+
+ > .icon-img {
+ @apply w-6 h-auto;
+ }
+ }
+ }
+
+ > .img-container {
+ @apply w-full h-full p-4 flex flex-col justify-center items-center;
+ background-color: unset;
+ .hide-scroll-bar();
+
+ > img {
+ @apply h-auto w-auto max-w-full max-h-full shadow;
+ }
+ }
+ }
+}